diff --git a/README.md b/README.md
index cabda66..cded7cf 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ function mytheme_set_marker_data($microdata, $annonce_id) {
 #### Change title of filter bloc over the map
 ```
 add_filter('bloc_filter_title', 'mytheme_set_filter_title', 10, 1);
-function mytheme_set_marker_data($filter_title) {
+function mytheme_set_filter_title($filter_title) {
     // datas
     return $filter_title;
 }
diff --git a/annonces.config.json b/annonces.config.json
index b553435..2e1b03e 100644
--- a/annonces.config.json
+++ b/annonces.config.json
@@ -4,7 +4,9 @@
 	"modules": [
 		"core/core.config.json",
 		"modules/option/option.config.json",
-		"modules/annonce/annonce.config.json"
+		"modules/annonce/annonce.config.json",
+		"modules/label/label.config.json",
+		"modules/contact/contact.config.json"
 	],
-	"version": "2.0.0"
+	"version": "2.1.0"
 }
diff --git a/annonces.php b/annonces.php
index b7e2c13..36232b6 100644
--- a/annonces.php
+++ b/annonces.php
@@ -3,7 +3,7 @@
  * Plugin Name: Annonces
  * Plugin URI:
  * Description: Add all type of announces you need to display in a large map.
- * Version: 2.0.0
+ * Version: 2.1.0
  * Author: Eoxia <dev@eoxia.com>
  * Author URI: http://www.eoxia.com/
  * License: AGPL-3.0 or later
@@ -23,11 +23,27 @@
 /**
  * Enable ACF 5 early access
  */
-DEFINE( 'ACF_EARLY_ACCESS', '5' );
+if ( ! defined( 'ACF_EARLY_ACCESS' ) ) {
+	DEFINE( 'ACF_EARLY_ACCESS', '5' );
+}
 
 // Include EO_Framework.
 require_once 'core/external/eo-framework/eo-framework.php';
 
+/**
+ * Regenerate permalinks
+ *
+ * @since 2.1.0
+ * @return void
+ */
+function my_rewrite_flush() {
+	Annonce_Action::g()->annonces_generate_post_type;
+	Label_Action::g()->label_generate_post_type;
+
+	flush_rewrite_rules();
+}
+register_activation_hook( __FILE__, '\annonces\my_rewrite_flush' );
+
 
 // Boot your plugin.
 \eoxia\Init_Util::g()->exec( PLUGIN_ANNONCES_PATH, basename( __FILE__, '.php' ) );
diff --git a/core/action/core.action.php b/core/action/core.action.php
index 8d4f266..0709138 100644
--- a/core/action/core.action.php
+++ b/core/action/core.action.php
@@ -61,7 +61,6 @@ public function callback_front_enqueue_scripts() {
 		wp_enqueue_script( 'annonces-frontend-script' );
 
 		/** Aller chercher la clé entrée dans les options de configuration */
-		// $api_key = 'AIzaSyAjNX-2ycIAskm4GmdWpmYhSG0XCHB2KgY';
 		$api_key = get_option( 'annonces_google_key' );
 		wp_enqueue_script( 'annonces-google-map-api', 'https://maps.googleapis.com/maps/api/js?key=' . $api_key, array(), '', true );
 	}
@@ -74,6 +73,7 @@ public function callback_front_enqueue_scripts() {
 	 */
 	public function acf_version_notice() {
 		if ( ! is_acf() ) return;
+		if ( ! file_exists( PLUGIN_ANNONCES_PATH . '/../advanced-custom-fields/acf.php' ) ) return;
 
 		$acf_datas = get_plugin_data( PLUGIN_ANNONCES_PATH . '/../advanced-custom-fields/acf.php' );
 		if ( (int) substr( $acf_datas['Version'], 0, 1 ) < 5 ) {
diff --git a/core/asset/css/scss/_variables.scss b/core/asset/css/scss/_variables.scss
index 2778cd7..b413a03 100644
--- a/core/asset/css/scss/_variables.scss
+++ b/core/asset/css/scss/_variables.scss
@@ -4,3 +4,7 @@
  * @since 0.1.0
  * @version 0.1.0
  */
+
+ $media__large: 1200px;
+ $media__medium: 770px;
+ $media__small: 480px;
diff --git a/core/asset/css/scss/modules/_modules.scss b/core/asset/css/scss/modules/_modules.scss
index f3536e3..34e0a6a 100644
--- a/core/asset/css/scss/modules/_modules.scss
+++ b/core/asset/css/scss/modules/_modules.scss
@@ -1 +1,2 @@
 @import "annonce/annonce";
+@import "label/label";
diff --git a/core/asset/css/scss/modules/annonce/_annonce.scss b/core/asset/css/scss/modules/annonce/_annonce.scss
index f0c9342..9e67ade 100644
--- a/core/asset/css/scss/modules/annonce/_annonce.scss
+++ b/core/asset/css/scss/modules/annonce/_annonce.scss
@@ -1,5 +1,6 @@
 @import "map";
 @import "single";
+@import "associated";
 
 #annonces-google-map {
 	width: 100%;
diff --git a/core/asset/css/scss/modules/annonce/_associated.scss b/core/asset/css/scss/modules/annonce/_associated.scss
new file mode 100644
index 0000000..0cd61e9
--- /dev/null
+++ b/core/asset/css/scss/modules/annonce/_associated.scss
@@ -0,0 +1,12 @@
+.associated-announces .associated-content {
+	.associated-element-content {
+		align-self: center;
+	}
+	.element-title, .element-tax {
+		line-height: 1;
+	}
+	figure img {
+		max-height: 100px;
+		width: auto;
+	}
+}
diff --git a/core/asset/css/scss/modules/annonce/_map.scss b/core/asset/css/scss/modules/annonce/_map.scss
index a0eef49..1a50166 100644
--- a/core/asset/css/scss/modules/annonce/_map.scss
+++ b/core/asset/css/scss/modules/annonce/_map.scss
@@ -18,6 +18,16 @@
 	max-width: 240px;
 	box-shadow: 0 0 40px rgba(0,0,0,0.2);
 
+	@media ( max-width: $media__medium ) {
+		left: 0;
+		top: 0;
+		right: 0;
+		width: 100%;
+		max-width: none;
+		max-height: 160px;
+		transform: none;
+	}
+
 	.taxonomies-entete {
 		padding: 1em;
 		background: rgba(0,0,0,0.1);
diff --git a/core/asset/css/scss/modules/label/_label.scss b/core/asset/css/scss/modules/label/_label.scss
new file mode 100644
index 0000000..e69de29
diff --git a/core/asset/css/style.css b/core/asset/css/style.css
index e14f31f..b32d1a8 100644
--- a/core/asset/css/style.css
+++ b/core/asset/css/style.css
@@ -69,6 +69,18 @@
   -webkit-box-shadow: 0 0 40px rgba(0, 0, 0, 0.2);
           box-shadow: 0 0 40px rgba(0, 0, 0, 0.2); }
 
+@media (max-width: 770px) {
+  #annonces-map-wrapper .annonces-taxonomies {
+    left: 0;
+    top: 0;
+    right: 0;
+    width: 100%;
+    max-width: none;
+    max-height: 160px;
+    -webkit-transform: none;
+        -ms-transform: none;
+            transform: none; } }
+
 #annonces-map-wrapper .annonces-taxonomies .taxonomies-entete {
   padding: 1em;
   background: rgba(0, 0, 0, 0.1); }
@@ -151,6 +163,19 @@
 #annonces-google-map {
   margin: 2em 0; }
 
+.associated-announces .associated-content .associated-element-content {
+  -webkit-align-self: center;
+      -ms-flex-item-align: center;
+              -ms-grid-row-align: center;
+          align-self: center; }
+
+.associated-announces .associated-content .element-title, .associated-announces .associated-content .element-tax {
+  line-height: 1; }
+
+.associated-announces .associated-content figure img {
+  max-height: 100px;
+  width: auto; }
+
 #annonces-google-map {
   width: 100%;
   height: 500px;
diff --git a/core/asset/css/style.min.css b/core/asset/css/style.min.css
index 9afe887..ebbaaa2 100644
--- a/core/asset/css/style.min.css
+++ b/core/asset/css/style.min.css
@@ -1 +1 @@
-@charset "UTF-8";.marker-container{max-width:350px}.marker-container p{margin:0}.marker-container .content .content-title{font-size:24px;margin-bottom:.4em}.marker-container .content .content-description{margin-bottom:1em}.marker-container .content .content-datas{list-style-type:none;margin:0 0 1em}.marker-container .content .content-datas li{display:-ms-grid;display:grid;-ms-grid-columns:20px 1fr;grid-template-columns:20px 1fr;margin:.4em 0}.marker-container .content .content-datas li .data-icon{-ms-grid-row-span:2;-ms-grid-row:auto;grid-row:auto / span 2}.marker-container .content .content-datas li .data-title{font-size:10px;text-transform:uppercase;font-weight:900}.marker-container .content .wpeo-button{padding:2px 10px}#annonces-map-wrapper{position:relative}#annonces-map-wrapper .annonces-taxonomies{position:absolute;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);right:2em;max-height:100%;overflow-y:auto;background:#fff;width:100%;max-width:240px;-webkit-box-shadow:0 0 40px rgba(0,0,0,.2);box-shadow:0 0 40px rgba(0,0,0,.2)}#annonces-map-wrapper .annonces-taxonomies .taxonomies-entete{padding:1em;background:rgba(0,0,0,.1)}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container{padding:1em}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .annonces-taxonomy{display:-ms-grid;display:grid;-ms-grid-columns:30px 1fr;grid-template-columns:30px 1fr;margin:.4em 0}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .annonces-taxonomy img{max-width:26px;-webkit-align-self:center;-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center;-ms-grid-column:1;grid-column:1}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .annonces-taxonomy .taxonomy-label{-ms-grid-column:2;grid-column:2;padding-right:20px}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .annonces-taxonomy .taxonomies-child{-ms-grid-column-span:2;-ms-grid-column:1;grid-column:1 / span 2;margin-left:2em}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .annonces-taxonomy .taxonomies-child .taxonomy-label{display:block}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label{position:relative;color:rgba(0,0,0,.8);-webkit-transition:all .2s ease-out;transition:all .2s ease-out}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label:before,#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label:after{display:inline-block;content:'';position:absolute;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);right:0;-webkit-transition:all .2s ease-out;transition:all .2s ease-out}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label:after{border:1px solid rgba(0,0,0,.4);background:#fff;width:16px;height:16px}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label:before{right:3px;background:#7f70f5;padding-left:4px;width:10px;height:10px;z-index:1;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label:hover{cursor:pointer;color:rgba(0,0,0,.5)}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label.active:before{opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}#annonces-google-map{margin:2em 0}#annonces-google-map{width:100%;height:500px;background:rgba(0,0,0,.1)}
\ No newline at end of file
+@charset "UTF-8";.marker-container{max-width:350px}.marker-container p{margin:0}.marker-container .content .content-title{font-size:24px;margin-bottom:.4em}.marker-container .content .content-description{margin-bottom:1em}.marker-container .content .content-datas{list-style-type:none;margin:0 0 1em}.marker-container .content .content-datas li{display:-ms-grid;display:grid;-ms-grid-columns:20px 1fr;grid-template-columns:20px 1fr;margin:.4em 0}.marker-container .content .content-datas li .data-icon{-ms-grid-row-span:2;-ms-grid-row:auto;grid-row:auto / span 2}.marker-container .content .content-datas li .data-title{font-size:10px;text-transform:uppercase;font-weight:900}.marker-container .content .wpeo-button{padding:2px 10px}#annonces-map-wrapper{position:relative}#annonces-map-wrapper .annonces-taxonomies{position:absolute;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);right:2em;max-height:100%;overflow-y:auto;background:#fff;width:100%;max-width:240px;-webkit-box-shadow:0 0 40px rgba(0,0,0,.2);box-shadow:0 0 40px rgba(0,0,0,.2)}@media(max-width:770px){#annonces-map-wrapper .annonces-taxonomies{left:0;top:0;right:0;width:100%;max-width:none;max-height:160px;-webkit-transform:none;-ms-transform:none;transform:none}}#annonces-map-wrapper .annonces-taxonomies .taxonomies-entete{padding:1em;background:rgba(0,0,0,.1)}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container{padding:1em}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .annonces-taxonomy{display:-ms-grid;display:grid;-ms-grid-columns:30px 1fr;grid-template-columns:30px 1fr;margin:.4em 0}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .annonces-taxonomy img{max-width:26px;-webkit-align-self:center;-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center;-ms-grid-column:1;grid-column:1}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .annonces-taxonomy .taxonomy-label{-ms-grid-column:2;grid-column:2;padding-right:20px}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .annonces-taxonomy .taxonomies-child{-ms-grid-column-span:2;-ms-grid-column:1;grid-column:1 / span 2;margin-left:2em}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .annonces-taxonomy .taxonomies-child .taxonomy-label{display:block}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label{position:relative;color:rgba(0,0,0,.8);-webkit-transition:all .2s ease-out;transition:all .2s ease-out}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label:before,#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label:after{display:inline-block;content:'';position:absolute;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);right:0;-webkit-transition:all .2s ease-out;transition:all .2s ease-out}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label:after{border:1px solid rgba(0,0,0,.4);background:#fff;width:16px;height:16px}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label:before{right:3px;background:#7f70f5;padding-left:4px;width:10px;height:10px;z-index:1;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label:hover{cursor:pointer;color:rgba(0,0,0,.5)}#annonces-map-wrapper .annonces-taxonomies .taxonomies-container .taxonomy-label.active:before{opacity:1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"}#annonces-google-map{margin:2em 0}.associated-announces .associated-content .associated-element-content{-webkit-align-self:center;-ms-flex-item-align:center;-ms-grid-row-align:center;align-self:center}.associated-announces .associated-content .element-title,.associated-announces .associated-content .element-tax{line-height:1}.associated-announces .associated-content figure img{max-height:100px;width:auto}#annonces-google-map{width:100%;height:500px;background:rgba(0,0,0,.1)}
\ No newline at end of file
diff --git a/core/asset/js/backend.min.js b/core/asset/js/backend.min.js
index d70a015..b54cb69 100644
--- a/core/asset/js/backend.min.js
+++ b/core/asset/js/backend.min.js
@@ -107,11 +107,11 @@ window.eoxiaJS.annonces.annonce.createMap = function( map ) {
 
 	jQuery( '.annonces-taxonomies .taxonomy-label' ).on( 'click', function() {
 		if ( jQuery( this ).hasClass( 'active' ) ) {
-			window.eoxiaJS.annonces.annonce.displayMapMarkers( $htmlMarker, $listMarker, null, jQuery( this ).attr( 'data-id' ) );
+			window.eoxiaJS.annonces.annonce.displayMapMarkers( $htmlMarker, $listMarker, null, jQuery( this ).attr( 'data-id' ).split( ',' ) );
 			jQuery( this ).removeClass( 'active' );
 			jQuery( this ).next('.taxonomies-child').find( '.taxonomy-label' ).removeClass( 'active' );
 		} else {
-			window.eoxiaJS.annonces.annonce.displayMapMarkers( $htmlMarker, $listMarker, $gMap, jQuery( this ).attr( 'data-id' ) );
+			window.eoxiaJS.annonces.annonce.displayMapMarkers( $htmlMarker, $listMarker, $gMap, jQuery( this ).attr( 'data-id' ).split( ',' ) );
 			jQuery( this ).addClass( 'active' );
 			jQuery( this ).next('.taxonomies-child').find( '.taxonomy-label' ).addClass( 'active' );
 		}
@@ -169,13 +169,17 @@ window.eoxiaJS.annonces.annonce.createInfoWindow = function( marker ) {
  * @param  {Array} map Map
  * @return {void}
  */
-window.eoxiaJS.annonces.annonce.displayMapMarkers = function( htmlMarker, listMarkers, map, taxId ) {
+window.eoxiaJS.annonces.annonce.displayMapMarkers = function( htmlMarker, listMarkers, map, listTaxId ) {
 	for (var i = 0; i < listMarkers.length; i++) {
 		var taxonomies = htmlMarker[i].attr( 'taxonomy' ).split( ',' );
+		/** Loop over all markers */
 		taxonomies.forEach(function(tax) {
-			if ( tax == taxId ) {
-				listMarkers[i].setMap(map);
-			}
+			/** Loop over all chosen taxonomies */
+			listTaxId.forEach(function(id) {
+				if ( tax == id ) {
+					listMarkers[i].setMap(map);
+				}
+			});
 		});
 	}
 }
diff --git a/core/asset/languages/annonces-fr_FR.mo b/core/asset/languages/annonces-fr_FR.mo
index 8434fbb..4e3e80b 100644
Binary files a/core/asset/languages/annonces-fr_FR.mo and b/core/asset/languages/annonces-fr_FR.mo differ
diff --git a/core/asset/languages/annonces-fr_FR.po b/core/asset/languages/annonces-fr_FR.po
index cb03cbf..ad8129b 100644
--- a/core/asset/languages/annonces-fr_FR.po
+++ b/core/asset/languages/annonces-fr_FR.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Annonces v2.x.x\n"
-"POT-Creation-Date: 2018-07-02 17:49+0200\n"
-"PO-Revision-Date: 2018-07-02 17:49+0200\n"
+"POT-Creation-Date: 2018-07-17 17:34+0200\n"
+"PO-Revision-Date: 2018-07-18 14:52+0200\n"
 "Last-Translator: \n"
 "Language-Team: Eoxia dev@eoxia.com\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 2.0.9\n"
 "X-Poedit-Basepath: ../../..\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -120,43 +120,79 @@ msgstr "Retourner à la page d'installation des extensions requises"
 
 #: core/util/core.util.php:84
 msgid "Plugin activated successfully."
-msgstr "L'extension a été activée"
+msgstr "L'extension a été activée."
 
 #: core/util/core.util.php:85
 #, php-format
 msgid "All plugins installed and activated successfully. %s"
-msgstr "Tous les plugins ont été installés et activés : %s."
+msgstr "Tous les plugins ont été installés et activés : %s"
 
+#: modules/annonce/action/annonce.action.php:42
 #: modules/annonce/action/annonce.action.php:43
-#: modules/annonce/shortcode/annonce.shortcode.php:91
+#: modules/annonce/action/annonce.action.php:63
+#: modules/annonce/shortcode/annonce.shortcode.php:114
 #: modules/option/action/option.action.php:41
-#: modules/option/action/option.action.php:77
+#: modules/option/action/option.action.php:82
 msgid "Announces"
 msgstr "Annonces"
 
-#: modules/annonce/action/annonce.action.php:46
+#: modules/annonce/action/annonce.action.php:66
 msgid "Announce"
 msgstr "Annonce"
 
-#: modules/annonce/action/annonce.action.php:82
-msgid "Announce taxonomy"
+#: modules/annonce/action/annonce.action.php:101
+#: modules/annonce/action/annonce.action.php:102
+msgid "Announce taxonomies"
 msgstr "Catégories annonces"
 
-#: modules/annonce/shortcode/annonce.shortcode.php:46
+#: modules/annonce/action/annonce.action.php:118
+msgid "Announce taxonomy"
+msgstr "Catégorie annonces"
+
+#: modules/annonce/shortcode/annonce.shortcode.php:48
 #: modules/annonce/view/single-announce.php:37
 msgid "Email"
 msgstr "Email"
 
-#: modules/annonce/shortcode/annonce.shortcode.php:51
+#: modules/annonce/shortcode/annonce.shortcode.php:53
 #: modules/annonce/view/single-announce.php:43
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
+#: modules/annonce/shortcode/annonce.shortcode.php:58
+#: modules/annonce/view/single-announce.php:49
+msgid "Address"
+msgstr "Adresse"
+
 #: modules/annonce/view/main-markers.view.php:46
 msgid "See"
 msgstr "Voir"
 
-#: modules/option/action/option.action.php:84
+#: modules/annonce/view/single-announce.php:60
+msgid "Author"
+msgstr "Auteur"
+
+#: modules/annonce/view/single-announce.php:71
+msgid "Associated labels"
+msgstr "Certifications associées"
+
+#: modules/contact/view/main.view.php:19 modules/label/view/single-label.php:57
+msgid "Associated announces"
+msgstr "Annonces associées"
+
+#: modules/label/action/label.action.php:41
+msgid "Labels"
+msgstr "Certifications"
+
+#: modules/label/action/label.action.php:44
+msgid "Label"
+msgstr "Certification"
+
+#: modules/label/view/single-label.php:37
+msgid "Website"
+msgstr "Site internet"
+
+#: modules/option/action/option.action.php:89
 msgid "Permalink Announce"
 msgstr "Permalien de Annonces"
 
@@ -173,8 +209,25 @@ msgid "Obtain a google map api key"
 msgstr "Obtenir une clé API Google Map"
 
 #: modules/option/view/main.view.php:32
+msgid "Display label module"
+msgstr "Afficher le module appellation"
+
+#: modules/option/view/main.view.php:36
+msgid "Activate"
+msgstr "Activer"
+
+#: modules/option/view/main.view.php:39
+msgid "Check to display the label module"
+msgstr "Cocher pour afficher le module Appellation"
+
+#: modules/option/view/main.view.php:44
 msgid "Update"
 msgstr "Mise à jour"
 
+#, fuzzy
+#~| msgid "Announces"
+#~ msgid "Annonces"
+#~ msgstr "Annonces"
+
 #~ msgid "You have to reload website permalinks after changing"
 #~ msgstr "Vous devrez par la suite mettre à jour les permaliens de votre site"
diff --git a/core/core.config.json b/core/core.config.json
index 29e8bd0..4d3d997 100644
--- a/core/core.config.json
+++ b/core/core.config.json
@@ -8,6 +8,7 @@
 		"action": {},
 		"class": {},
 		"util": {},
-		"helper": {}
+		"helper": {},
+		"filter" : {}
 	}
 }
diff --git a/core/filter/core.filter.php b/core/filter/core.filter.php
new file mode 100644
index 0000000..c8caabc
--- /dev/null
+++ b/core/filter/core.filter.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Mains filters of module
+ *
+ * @author    Eoxia <dev@eoxia.com>
+ * @copyright (c) 2006-2018 Eoxia <dev@eoxia.com>
+ * @license   AGPLv3 <https://spdx.org/licenses/AGPL-3.0-or-later.html>
+ * @package   Annonces\Actions
+ * @since     2.0.0
+ */
+
+namespace annonces;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Main actions of annonces
+ */
+class Core_Filter {
+
+	/**
+	 * Constructor
+	 *
+	 * @since 2.0.0
+	 */
+	public function __construct() {
+		add_filter( 'acf/fields/google_map/api', array( $this, 'acf_filter_googlemap_api' ), 11 );
+	}
+
+	/**
+	 * Change google map api key for ACF Map
+	 *
+	 * @since 2.0.0
+	 *
+	 * @param  string $api Google key.
+	 *
+	 * @return string $api Google key.
+	 */
+	public function acf_filter_googlemap_api( $api ) {
+		$api_key    = get_option( 'annonces_google_key' );
+		$api['key'] = ( ! empty( $api_key ) ) ? $api_key : '';
+		return $api;
+	}
+
+}
+
+new Core_Filter();
diff --git a/core/filter/index.php b/core/filter/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/annonce/action/annonce.action.php b/modules/annonce/action/annonce.action.php
index 8baff79..2d0f901 100644
--- a/modules/annonce/action/annonce.action.php
+++ b/modules/annonce/action/annonce.action.php
@@ -16,17 +16,37 @@
 /**
  * Action of "Hello_World" module.
  */
-class Annonce_Actions {
+class Annonce_Action extends \eoxia\Singleton_Util {
 
 	/**
 	 * Constructor
 	 *
 	 * @since 2.0.0
-	 * @version 2.0.0
 	 */
-	public function __construct() {
-		add_action( 'init', array( $this, 'annonces_generate_post_type' ), 11 );
-		add_action( 'init', array( $this, 'announce_taxonomy' ), 11 );
+	protected function construct() {
+		add_action( 'admin_menu', array( $this, 'annonces_admin_menu' ) );
+		add_action( 'admin_menu', array( $this, 'submenupage_annonces' ) );
+		add_action( 'init', array( $this, 'annonces_generate_post_type' ) );
+		add_action( 'init', array( $this, 'announce_taxonomy' ) );
+		add_action( 'parent_file', array( $this, 'prefix_highlight_taxonomy_parent_menu' ) );
+	}
+
+	/**
+	 * Adding a menu to contain the custom post types for Announce
+	 *
+	 * @since 2.0.0
+	 * @return void
+	 */
+	public function annonces_admin_menu() {
+		add_menu_page(
+			__( 'Announces', 'annonces' ),
+			__( 'Announces', 'annonces' ),
+			'read',
+			'annonces-menu',
+			'',
+			'dashicons-location',
+			5
+		);
 	}
 
 	/**
@@ -45,12 +65,12 @@ public function annonces_generate_post_type() {
 		$args   = array(
 			'label'               => __( 'Announce', 'annonces' ),
 			'labels'              => $labels,
-			'supports'            => array( 'title', 'editor', 'thumbnail', 'revisions' ),
+			'supports'            => array( 'title', 'editor', 'thumbnail', 'revisions', 'author' ),
 			'taxonomies'          => array( 'announce_taxonomy' ),
 			'hierarchical'        => false,
 			'public'              => true,
 			'show_ui'             => true,
-			'show_in_menu'        => true,
+			'show_in_menu'        => 'annonces-menu',
 			'menu_position'       => 5,
 			'menu_icon'           => 'dashicons-location',
 			'show_in_admin_bar'   => true,
@@ -65,7 +85,25 @@ public function annonces_generate_post_type() {
 			),
 		);
 		register_post_type( 'announce', $args );
+		/** Regenerate permalinks */
+		flush_rewrite_rules();
+	}
 
+
+	/**
+	 * Adding a submenu to contain the custom taxonomies for Announce
+	 *
+	 * @since 2.0.0
+	 * @return void
+	 */
+	public function submenupage_annonces() {
+		add_submenu_page(
+			'annonces-menu',
+			esc_html__( 'Announce taxonomies', 'annonces' ),
+			esc_html__( 'Announce taxonomies', 'annonces' ),
+			'read',
+			'edit-tags.php?taxonomy=announce_taxonomy'
+		);
 	}
 
 	/**
@@ -75,7 +113,6 @@ public function annonces_generate_post_type() {
 	 * @return void
 	 */
 	public function announce_taxonomy() {
-
 		$labels = array(
 			'name'          => _x( 'Announce taxonomies', 'Taxonomy General Name', 'annonces' ),
 			'singular_name' => _x( 'Announce taxonomy', 'Taxonomy Singular Name', 'annonces' ),
@@ -86,12 +123,26 @@ public function announce_taxonomy() {
 			'hierarchical'      => true,
 			'public'            => true,
 			'show_ui'           => true,
+			'show_in_menu'      => 'annonces-menu',
 			'show_admin_column' => true,
 			'show_in_nav_menus' => true,
 			'show_tagcloud'     => true,
 		);
 		register_taxonomy( 'announce_taxonomy', array( 'announce' ), $args );
 	}
+
+	/**
+	 * Highlight the Announce Taxonomies submenupage
+	 *
+	 * @since 2.0.0
+	 * @return $parent_file
+	 */
+	public function prefix_highlight_taxonomy_parent_menu( $parent_file ) {
+		if ( 'announce_taxonomy' === get_current_screen()->taxonomy ) {
+			$parent_file = 'annonces-menu';
+		}
+		return $parent_file;
+	}
 }
 
-new Annonce_Actions();
+new Annonce_Action();
diff --git a/modules/annonce/asset/js/annonce.backend.js b/modules/annonce/asset/js/annonce.backend.js
index 3f37bda..a778083 100644
--- a/modules/annonce/asset/js/annonce.backend.js
+++ b/modules/annonce/asset/js/annonce.backend.js
@@ -83,11 +83,11 @@ window.eoxiaJS.annonces.annonce.createMap = function( map ) {
 
 	jQuery( '.annonces-taxonomies .taxonomy-label' ).on( 'click', function() {
 		if ( jQuery( this ).hasClass( 'active' ) ) {
-			window.eoxiaJS.annonces.annonce.displayMapMarkers( $htmlMarker, $listMarker, null, jQuery( this ).attr( 'data-id' ) );
+			window.eoxiaJS.annonces.annonce.displayMapMarkers( $htmlMarker, $listMarker, null, jQuery( this ).attr( 'data-id' ).split( ',' ) );
 			jQuery( this ).removeClass( 'active' );
 			jQuery( this ).next('.taxonomies-child').find( '.taxonomy-label' ).removeClass( 'active' );
 		} else {
-			window.eoxiaJS.annonces.annonce.displayMapMarkers( $htmlMarker, $listMarker, $gMap, jQuery( this ).attr( 'data-id' ) );
+			window.eoxiaJS.annonces.annonce.displayMapMarkers( $htmlMarker, $listMarker, $gMap, jQuery( this ).attr( 'data-id' ).split( ',' ) );
 			jQuery( this ).addClass( 'active' );
 			jQuery( this ).next('.taxonomies-child').find( '.taxonomy-label' ).addClass( 'active' );
 		}
@@ -145,13 +145,17 @@ window.eoxiaJS.annonces.annonce.createInfoWindow = function( marker ) {
  * @param  {Array} map Map
  * @return {void}
  */
-window.eoxiaJS.annonces.annonce.displayMapMarkers = function( htmlMarker, listMarkers, map, taxId ) {
+window.eoxiaJS.annonces.annonce.displayMapMarkers = function( htmlMarker, listMarkers, map, listTaxId ) {
 	for (var i = 0; i < listMarkers.length; i++) {
 		var taxonomies = htmlMarker[i].attr( 'taxonomy' ).split( ',' );
+		/** Loop over all markers */
 		taxonomies.forEach(function(tax) {
-			if ( tax == taxId ) {
-				listMarkers[i].setMap(map);
-			}
+			/** Loop over all chosen taxonomies */
+			listTaxId.forEach(function(id) {
+				if ( tax == id ) {
+					listMarkers[i].setMap(map);
+				}
+			});
 		});
 	}
 }
diff --git a/modules/annonce/asset/json/group_5b325b90adbfd.json b/modules/annonce/asset/json/group_5b325b90adbfd.json
index a5dbfcc..ae79f03 100644
--- a/modules/annonce/asset/json/group_5b325b90adbfd.json
+++ b/modules/annonce/asset/json/group_5b325b90adbfd.json
@@ -1,60 +1,61 @@
-    {
-        "key": "group_5b325b90adbfd",
-        "title": "Annonces - défaut",
-        "fields": [
-            {
-                "key": "field_5b339eaa28564",
-                "label": "Email",
-                "name": "email",
-                "type": "email",
-                "instructions": "",
-                "required": 0,
-                "conditional_logic": 0,
-                "wrapper": {
-                    "width": "",
-                    "class": "",
-                    "id": ""
-                },
-                "default_value": "",
-                "placeholder": "",
-                "prepend": "<span class=\"dashicons dashicons-email\"><\/span>",
-                "append": ""
+{
+    "key": "group_5b325b90adbfd",
+    "title": "Annonces - défaut",
+    "fields": [
+        {
+            "key": "field_5b339eaa28564",
+            "label": "Email",
+            "name": "email",
+            "type": "email",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "default_value": "",
+            "placeholder": "",
+            "prepend": "<span class=\"dashicons dashicons-email\"><\/span>",
+            "append": ""
+        },
+        {
+            "key": "field_5b339f3b28565",
+            "label": "Téléphone",
+            "name": "telephone",
+            "type": "text",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
             },
+            "default_value": "",
+            "placeholder": "",
+            "prepend": "<span class=\"dashicons dashicons-smartphone\"><\/span>",
+            "append": "",
+            "maxlength": ""
+        }
+    ],
+    "location": [
+        [
             {
-                "key": "field_5b339f3b28565",
-                "label": "Téléphone",
-                "name": "telephone",
-                "type": "text",
-                "instructions": "",
-                "required": 0,
-                "conditional_logic": 0,
-                "wrapper": {
-                    "width": "",
-                    "class": "",
-                    "id": ""
-                },
-                "default_value": "",
-                "placeholder": "",
-                "prepend": "<span class=\"dashicons dashicons-smartphone\"><\/span>",
-                "append": "",
-                "maxlength": ""
+                "param": "post_type",
+                "operator": "==",
+                "value": "announce"
             }
-        ],
-        "location": [
-            [
-                {
-                    "param": "post_type",
-                    "operator": "==",
-                    "value": "announce"
-                }
-            ]
-        ],
-        "menu_order": 0,
-        "position": "normal",
-        "style": "default",
-        "label_placement": "top",
-        "instruction_placement": "label",
-        "hide_on_screen": "",
-        "active": 1,
-        "description": ""
-    }
+        ]
+    ],
+    "menu_order": 0,
+    "position": "normal",
+    "style": "default",
+    "label_placement": "top",
+    "instruction_placement": "label",
+    "hide_on_screen": "",
+    "active": 1,
+    "description": "",
+    "modified": 1531485978
+}
diff --git a/modules/annonce/filter/annonce.filter.php b/modules/annonce/filter/annonce.filter.php
index 8b1fa80..beccfed 100644
--- a/modules/annonce/filter/annonce.filter.php
+++ b/modules/annonce/filter/annonce.filter.php
@@ -58,7 +58,7 @@ public function get_custom_post_type_template( $single_template ) {
 			if ( ! empty( $path_to_theme ) ) {
 				$single_template = $path_to_theme;
 			} else {
-				$single_template = PLUGIN_ANNONCES_PATH . '\modules\annonce\view\single-announce.php';
+				$single_template = str_replace( '\\', '/', PLUGIN_ANNONCES_PATH . '\modules\annonce\view\single-announce.php' );
 			}
 		}
 
diff --git a/modules/annonce/shortcode/annonce.shortcode.php b/modules/annonce/shortcode/annonce.shortcode.php
index 6d0ebb8..bdd6e8e 100644
--- a/modules/annonce/shortcode/annonce.shortcode.php
+++ b/modules/annonce/shortcode/annonce.shortcode.php
@@ -39,8 +39,10 @@ public function annonces_display_shortcode( $atts ) {
 
 		if ( ! empty( $annonces_map_query->posts ) ) {
 			foreach ( $annonces_map_query->posts as &$annonce ) {
+				/** Address field */
 				$annonce->address = get_field( 'address', $annonce->ID );
-				$microdata        = array(
+				/** Datas to display in infowindow */
+				$microdata      = array(
 					array(
 						'icon'    => 'envelope',
 						'title'   => __( 'Email', 'annonces' ),
@@ -51,10 +53,16 @@ public function annonces_display_shortcode( $atts ) {
 						'title'   => __( 'Phone number', 'annonces' ),
 						'content' => get_field( 'telephone', $annonce->ID ),
 					),
+					array(
+						'icon'    => 'map-marker-alt',
+						'title'   => __( 'Address', 'annonces' ),
+						'content' => $annonce->address['address'],
+					),
 				);
-				$annonce->datas   = apply_filters( 'set_marker_data', $microdata, $annonce->ID );
-				$taxonomies       = wp_get_post_terms( $annonce->ID, 'announce_taxonomy', array() );
+				$annonce->datas = apply_filters( 'set_marker_data', $microdata, $annonce->ID );
 
+				/** All taxonomies of the announce */
+				$taxonomies   = wp_get_post_terms( $annonce->ID, 'announce_taxonomy', array() );
 				$annonce->tax = '';
 				if ( ! empty( $taxonomies ) ) :
 					foreach ( $taxonomies as $element ) :
@@ -63,6 +71,7 @@ public function annonces_display_shortcode( $atts ) {
 				endif;
 				$annonce->tax = substr( $annonce->tax, 0, -1 );
 
+				/** Pin color of the announce */
 				if ( 0 === $taxonomies[0]->parent ) :
 					$annonce->pin = get_field( 'icon', 'announce_taxonomy_' . $taxonomies[0]->term_id );
 				else :
@@ -71,6 +80,7 @@ public function annonces_display_shortcode( $atts ) {
 			}
 		}
 
+		/** List of all taxonomies */
 		$taxonomies_datas                    = new \stdClass();
 		$taxonomies_datas->taxonomies_parent = get_terms( array(
 			'taxonomy'     => 'announce_taxonomy',
@@ -78,16 +88,31 @@ public function annonces_display_shortcode( $atts ) {
 			'hierarchical' => true,
 			'hide_empty'   => false,
 		) );
+		/** Construct of the child tax array */
 		foreach ( $taxonomies_datas->taxonomies_parent as $parent ) {
-			$parent->taxonomies_child = get_terms( array(
+			$parent->taxonomies_child      = get_terms( array(
 				'taxonomy'     => 'announce_taxonomy',
 				'parent'       => $parent->term_id,
 				'hierarchical' => true,
 				'hide_empty'   => false,
 			) );
-			$parent->marker           = PLUGIN_ANNONCES_URL . 'modules/annonce/asset/img/pin-' . get_field( 'icon', $parent ) . '.png';
+
+			/** List of all tax ID */
+			$parent->list_tax_id = $parent->term_id . ',';
+			if ( ! empty( $parent->taxonomies_child ) ) {
+				foreach ( $parent->taxonomies_child as $child ) {
+					$parent->list_tax_id .= $child->term_id . ',';
+				}
+			}
+			$parent->list_tax_id = substr( $parent->list_tax_id, 0, -1 );
+
+			/** Pin color of the child */
+			$parent_marker_data = get_field( 'icon', $parent );
+			$parent_marker_data = ( ! empty( $parent_marker_data ) ) ? $parent_marker_data : 'red';
+			$parent->marker     = PLUGIN_ANNONCES_URL . 'modules/annonce/asset/img/pin-' . $parent_marker_data . '.png';
 		}
 
+		/** Title of filter bloc */
 		$filter_title                       = __( 'Announces', 'annonces' );
 		$taxonomies_datas->taxonomies_title = apply_filters( 'bloc_filter_title', $filter_title );
 
diff --git a/modules/annonce/view/main-markers.view.php b/modules/annonce/view/main-markers.view.php
index 33d986f..95b8952 100644
--- a/modules/annonce/view/main-markers.view.php
+++ b/modules/annonce/view/main-markers.view.php
@@ -43,7 +43,7 @@
 							<?php endif; ?>
 						<?php endforeach; ?>
 					</ul>
-					<a href="<?php echo esc_url( $annonce->guid ); ?>" class="wpeo-button button-main button-size-small"><?php esc_html_e( 'See', 'annonces' ); ?></a>
+					<a href="<?php echo esc_url( get_permalink( $annonce->ID ) ); ?>" class="wpeo-button button-main button-size-small"><?php esc_html_e( 'See', 'annonces' ); ?></a>
 				</div>
 			</div>
 		</marker> <?php
diff --git a/modules/annonce/view/main-taxonomies.view.php b/modules/annonce/view/main-taxonomies.view.php
index 11169ba..951b124 100644
--- a/modules/annonce/view/main-taxonomies.view.php
+++ b/modules/annonce/view/main-taxonomies.view.php
@@ -23,7 +23,7 @@
 		<?php foreach ( $taxonomies_datas->taxonomies_parent as $parent ) : ?>
 			<div class="annonces-taxonomy">
 				<img src="<?php echo esc_url( $parent->marker ); ?>" />
-				<span class="taxonomy-label active" data-id="<?php echo esc_attr( $parent->term_id ); ?>"><?php echo esc_html( $parent->name ); ?></span>
+				<span class="taxonomy-label active" data-id="<?php echo esc_attr( $parent->list_tax_id ); ?>"><?php echo esc_html( $parent->name ); ?></span>
 
 				<div class="taxonomies-child">
 					<?php foreach ( $parent->taxonomies_child as $child ) : ?>
diff --git a/modules/annonce/view/single-announce.php b/modules/annonce/view/single-announce.php
index dd19d7a..78be92b 100644
--- a/modules/annonce/view/single-announce.php
+++ b/modules/annonce/view/single-announce.php
@@ -34,28 +34,76 @@
 						<?php
 						$email = get_field( 'email' );
 						if ( ! empty( $email ) ) : ?>
-							<li class="annonce-data"><i class="fas fa-envelope"></i> <strong><?php esc_html_e( 'Email', 'annonces' ); ?></strong> : <?php the_field( 'email' ); ?></li> <?php
+							<li class="annonce-data"><i class="fas fa-envelope"></i> <strong><?php esc_html_e( 'Email', 'annonces' ); ?></strong> : <?php echo esc_html( $email ); ?></li> <?php
 						endif; ?>
 
 						<?php
 						$telephone = get_field( 'telephone' );
 						if ( ! empty( $telephone ) ) : ?>
-						<li class="annonce-data"><i class="fas fa-mobile-alt"></i> <strong><?php esc_html_e( 'Phone number', 'annonces' ); ?></strong> : <?php the_field( 'telephone' ); ?></li> <?php
+						<li class="annonce-data"><i class="fas fa-mobile-alt"></i> <strong><?php esc_html_e( 'Phone number', 'annonces' ); ?></strong> : <?php echo esc_html( $telephone ); ?></li> <?php
+						endif; ?>
+
+						<?php
+						$address = get_field( 'address' );
+						if ( ! empty( $address ) ) : ?>
+						<li class="annonce-data"><i class="fas fa-map-marker-alt"></i> <strong><?php esc_html_e( 'Address', 'annonces' ); ?></strong> : <?php echo esc_html( $address['address'] ); ?></li> <?php
 						endif; ?>
 					</ul>
+
+					<?php
+					$author_id        = get_the_author_meta( 'ID' );
+					$author_name      = get_the_author_meta( 'display_name' );
+					$author_permalink = get_author_posts_url( $author_id );
+					$author_gravatar  = get_avatar( $author_id );
+					?>
+					<div class="annonce-author">
+						<h2 class="author-title"><?php esc_html_e( 'Author', 'annonce' ); ?></h2>
+						<a href="<?php echo esc_url( $author_permalink ); ?>">
+							<?php echo $author_gravatar; ?>
+							<?php echo esc_html( $author_name ); ?>
+						</a>
+					</div>
+
+					<?php
+					$labels = get_field( 'labels' );
+					if ( ! empty( $labels ) && \eoxia\Config_Util::$init['annonces']->label->state ) : ?>
+						<div class="annonce-label">
+							<h2 class="label-title"><?php esc_html_e( 'Associated labels', 'annonces' ); ?></h2>
+							<div class="label-list">
+								<?php
+								foreach ( $labels as $label ) :
+									$thumbnail = get_the_post_thumbnail( $label->ID ); ?>
+
+									<a href="<?php echo esc_url( get_permalink( $label->ID ) ); ?>">
+										<?php
+										if ( ! empty( $thumbnail ) ) :
+											echo $thumbnail; // WPCS: XSS ok.
+										else :
+											echo esc_html( $label->post_title );
+										endif;
+										?>
+									</a>
+									<?php
+								endforeach;
+								?>
+							</div>
+						</div> <?php
+					endif;
+					?>
 				</div>
 			</div>
 
-			<?php $address = get_field( 'address' ); ?>
-			<div id="annonces-map-wrapper">
-				<div id="annonces-google-map">
-					<markers>
-						<marker id="<?php the_ID(); ?>"
-						lat="<?php echo esc_html( $address['lat'] ); ?>"
-						lng="<?php echo esc_html( $address['lng'] ); ?>"></marker>
-					</markers>
+			<?php if ( ! empty( $address ) ) : ?>
+				<div id="annonces-map-wrapper">
+					<div id="annonces-google-map">
+						<markers>
+							<marker id="<?php the_ID(); ?>"
+							lat="<?php echo esc_html( $address['lat'] ); ?>"
+							lng="<?php echo esc_html( $address['lng'] ); ?>"></marker>
+						</markers>
+					</div>
 				</div>
-			</div>
+			<?php endif; ?>
 			<?php
 
 			/** Comments */
diff --git a/modules/contact/action/contact.action.php b/modules/contact/action/contact.action.php
new file mode 100644
index 0000000..b8d28b4
--- /dev/null
+++ b/modules/contact/action/contact.action.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Action of Contact module.
+ *
+ * @author    Eoxia <dev@eoxia.com>
+ * @copyright (c) 2006-2018 Eoxia <dev@eoxia.com>
+ * @license   AGPLv3 <https://spdx.org/licenses/AGPL-3.0-or-later.html>
+ * @package   Annonces\contact\Actions
+ * @since     2.0.0
+ */
+
+namespace annonces;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Action of "Hello_World" module.
+ */
+class Contact_Action {
+
+	/**
+	 * Constructor
+	 *
+	 * @since 2.0.0
+	 */
+	public function __construct() {
+	}
+
+}
+
+new Contact_Action();
diff --git a/modules/contact/action/index.php b/modules/contact/action/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/contact/asset/index.php b/modules/contact/asset/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/contact/contact.config.json b/modules/contact/contact.config.json
new file mode 100644
index 0000000..781e3b4
--- /dev/null
+++ b/modules/contact/contact.config.json
@@ -0,0 +1,14 @@
+{
+    "name": "contact",
+    "slug": "contact",
+    "version": "2.1.0",
+    "path": "modules/contact",
+    "dependencies_func": [
+        "\\annonces\\is_acf"
+    ],
+    "dependencies": {
+        "action": {},
+        "filter": {}
+    },
+    "state": true
+}
diff --git a/modules/contact/filter/contact.filter.php b/modules/contact/filter/contact.filter.php
new file mode 100644
index 0000000..a362031
--- /dev/null
+++ b/modules/contact/filter/contact.filter.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Filters of Contact module.
+ *
+ * @author    Eoxia <dev@eoxia.com>
+ * @copyright (c) 2006-2018 Eoxia <dev@eoxia.com>
+ * @license   AGPLv3 <https://spdx.org/licenses/AGPL-3.0-or-later.html>
+ * @package   Annonces\contact\Filters
+ * @since     2.0.0
+ */
+
+namespace annonces;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Action of "Hello_World" module.
+ */
+class Contact_Filters {
+
+	/**
+	 * Constructor
+	 *
+	 * @since 2.0.0
+	 * @version 2.0.0
+	 */
+	public function __construct() {
+		add_filter( 'acf/settings/load_json', array( $this, 'annonces_annonce_json_load' ) );
+		// add_filter( 'the_content', array( $this, 'contact_view' ) );
+		add_filter( 'pre_get_posts', array( $this, 'display_associated_announces' ) );
+	}
+
+	/**
+	 * Add a json acf directory
+	 *
+	 * @since  2.0.0
+	 * @param  Array $paths Acf folders.
+	 * @return Array $paths Acf folders
+	 */
+	public function annonces_annonce_json_load( $paths ) {
+		if ( \eoxia\Config_Util::$init['annonces']->label->state ) {
+			$paths[] = PLUGIN_ANNONCES_PATH . 'modules/label/asset/json';
+		}
+		return $paths;
+	}
+
+	/**
+	 * View of single post author
+	 *
+	 * @param  string $content Content of page.
+	 * @return string $content Content of page.
+	 */
+	public function contact_view( $content ) {
+		if ( is_author() ) :
+			/* Get associated announces */
+			$announces_query = new \WP_Query( array(
+				'post_type' => 'announce',
+				'author'    => get_the_ID(),
+			) );
+
+			/* Get render */
+			ob_start();
+				\eoxia\View_Util::exec( 'annonces', 'contact', 'main', array(
+					'content'   => $content,
+					'announces' => $announces_query->posts,
+				) );
+
+			$content .= ob_get_clean();
+		endif;
+
+		return $content;
+	}
+
+	/**
+	 * Display associated announces
+	 *
+	 * @since  2.1.0
+	 * @param  array $query Query datas.
+	 * @return void
+	 */
+	public function display_associated_announces( $query ) {
+		if ( $query->is_author && $query->is_main_query() ) {
+			$query->set( 'post_type', array( 'post', 'announce' ) );
+		}
+	}
+
+}
+
+new Contact_Filters();
diff --git a/modules/contact/filter/index.php b/modules/contact/filter/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/contact/index.php b/modules/contact/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/contact/view/index.php b/modules/contact/view/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/contact/view/main.view.php b/modules/contact/view/main.view.php
new file mode 100644
index 0000000..4f18f4d
--- /dev/null
+++ b/modules/contact/view/main.view.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Main view of Contact module.
+ *
+ * @author    Eoxia <dev@eoxia.com>
+ * @copyright (c) 2006-2018 Eoxia <dev@eoxia.com>
+ * @license   AGPLv3 <https://spdx.org/licenses/AGPL-3.0-or-later.html>
+ * @package   Annonces\contact\Actions
+ * @since     2.0.0
+ */
+
+namespace annonces;
+
+defined( 'ABSPATH' ) || exit; ?>
+
+<?php if ( $announces ) : ?>
+
+	<div class="associated-announces">
+		<h2 class="associated-title"><?php esc_html_e( 'Associated announces', 'annonces' ); ?></h2>
+		<div class="associated-container wpeo-gridlayout grid-2">
+			<?php foreach ( $announces as $announce ) :
+				$announce_image = get_the_post_thumbnail( $announce->ID );
+
+				$taxonomies = wp_get_post_terms( $announce->ID, 'announce_taxonomy', array() );
+				$tax        = '';
+				if ( ! empty( $taxonomies ) ) :
+					foreach ( $taxonomies as $element ) :
+						$tax .= $element->name . ',';
+					endforeach;
+				endif;
+				$tax = substr( $tax, 0, -1 );
+				?>
+				<div class="associated-content wpeo-gridlayout grid-3 grid-gap-0">
+					<?php if ( ! empty( $announce_image ) ) : ?>
+						<figure><a href="<?php echo esc_url( get_permalink( $announce->ID ) ); ?>"><?php echo $announce_image; ?></a></figure>
+					<?php endif; ?>
+					<div class="associated-element-content gridw-2">
+						<h3 class="element-title"><a href="<?php echo esc_url( get_permalink( $announce->ID ) ); ?>"><?php echo esc_html( $announce->post_title ); ?></a></h3>
+						<div class="element-tax"><?php echo esc_html( $tax ); ?></div>
+					</div>
+				</div>
+			<?php endforeach; ?>
+		</div><!-- .associated-container -->
+	</div><!-- .label-associated -->
+
+<?php endif; ?>
diff --git a/modules/label/action/index.php b/modules/label/action/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/label/action/label.action.php b/modules/label/action/label.action.php
new file mode 100644
index 0000000..cc81961
--- /dev/null
+++ b/modules/label/action/label.action.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Action of Label module.
+ *
+ * @author    Eoxia <dev@eoxia.com>
+ * @copyright (c) 2006-2018 Eoxia <dev@eoxia.com>
+ * @license   AGPLv3 <https://spdx.org/licenses/AGPL-3.0-or-later.html>
+ * @package   Annonces\label\Actions
+ * @since     2.0.0
+ */
+
+namespace annonces;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Action of "Hello_World" module.
+ */
+class Label_Action extends \eoxia\Singleton_Util {
+
+	/**
+	 * Constructor
+	 *
+	 * @since 2.0.0
+	 */
+	protected function construct() {
+		add_action( 'init', array( $this, 'label_generate_post_type' ) );
+	}
+
+	/**
+	 * Register Announces post type
+	 *
+	 * @since 2.0.0
+	 * @return void
+	 */
+	public function label_generate_post_type() {
+
+		$labels = array(
+			'name'          => _x( 'Labels', 'Post Type General Name', 'annonces' ),
+			'singular_name' => _x( 'Label', 'Post Type Singular Name', 'annonces' ),
+			'menu_name'     => __( 'Labels', 'annonces' ),
+		);
+		$args   = array(
+			'label'               => __( 'Label', 'annonces' ),
+			'labels'              => $labels,
+			'supports'            => array( 'title', 'editor', 'thumbnail', 'revisions' ),
+			'hierarchical'        => false,
+			'public'              => true,
+			'show_ui'             => true,
+			'show_in_menu'        => 'annonces-menu',
+			'menu_position'       => 25,
+			'menu_icon'           => 'dashicons-tag',
+			'show_in_admin_bar'   => true,
+			'show_in_nav_menus'   => true,
+			'can_export'          => true,
+			'has_archive'         => false,
+			'exclude_from_search' => false,
+			'publicly_queryable'  => true,
+			'capability_type'     => 'post',
+		);
+		register_post_type( 'label', $args );
+
+	}
+
+}
+
+new Label_Action();
diff --git a/modules/label/asset/index.php b/modules/label/asset/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/label/asset/json/group_5b44bacc113cb.json b/modules/label/asset/json/group_5b44bacc113cb.json
new file mode 100644
index 0000000..0f080d1
--- /dev/null
+++ b/modules/label/asset/json/group_5b44bacc113cb.json
@@ -0,0 +1,115 @@
+{
+    "key": "group_5b44bacc113cb",
+    "title": "Annonces - Label",
+    "fields": [
+        {
+            "key": "field_5b486a2d519c5",
+            "label": "Organisation",
+            "name": "organisation",
+            "type": "group",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "layout": "block",
+            "sub_fields": [
+                {
+                    "key": "field_5b44bb131607c",
+                    "label": "website",
+                    "name": "website",
+                    "type": "text",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "",
+                        "class": "",
+                        "id": ""
+                    },
+                    "default_value": "",
+                    "placeholder": "",
+										"prepend": "<span class=\"dashicons dashicons-admin-site\"><\/span>",
+                    "append": "",
+                    "maxlength": ""
+                },
+                {
+                    "key": "field_5b486afe519c7",
+                    "label": "Phone number",
+                    "name": "telephone",
+                    "type": "text",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "",
+                        "class": "",
+                        "id": ""
+                    },
+                    "default_value": "",
+                    "placeholder": "",
+                    "prepend": "<span class=\"dashicons dashicons-phone\"><\/span>",
+                    "append": "",
+                    "maxlength": ""
+                },
+                {
+                    "key": "field_5b486b24519c8",
+                    "label": "Email",
+                    "name": "email",
+                    "type": "text",
+                    "instructions": "",
+                    "required": 0,
+                    "conditional_logic": 0,
+                    "wrapper": {
+                        "width": "",
+                        "class": "",
+                        "id": ""
+                    },
+                    "default_value": "",
+                    "placeholder": "",
+                    "prepend": "<span class=\"dashicons dashicons-email\"><\/span>",
+                    "append": "",
+                    "maxlength": ""
+                },
+								{
+										"key": "field_5b486aea519c6",
+										"label": "Address",
+										"name": "address",
+										"type": "google_map",
+										"instructions": "",
+										"required": 0,
+										"conditional_logic": 0,
+										"wrapper": {
+												"width": "",
+												"class": "",
+												"id": ""
+										},
+										"center_lat": "",
+										"center_lng": "",
+										"zoom": "",
+										"height": ""
+								}
+            ]
+        }
+    ],
+    "location": [
+        [
+            {
+                "param": "post_type",
+                "operator": "==",
+                "value": "label"
+            }
+        ]
+    ],
+    "menu_order": 0,
+    "position": "normal",
+    "style": "default",
+    "label_placement": "top",
+    "instruction_placement": "label",
+    "hide_on_screen": "",
+    "active": 1,
+    "description": ""
+}
diff --git a/modules/label/asset/json/group_5b44be244a566.json b/modules/label/asset/json/group_5b44be244a566.json
new file mode 100644
index 0000000..221c548
--- /dev/null
+++ b/modules/label/asset/json/group_5b44be244a566.json
@@ -0,0 +1,53 @@
+{
+    "key": "group_5b44be244a566",
+    "title": "Annonces - label associated",
+    "fields": [
+        {
+            "key": "field_5b44be386dc5a",
+            "label": "Labels",
+            "name": "labels",
+            "type": "relationship",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "post_type": [
+                "label"
+            ],
+            "taxonomy": [],
+            "filters": [
+                "search",
+                "post_type",
+                "taxonomy"
+            ],
+            "elements": [
+                "featured_image"
+            ],
+            "min": "",
+            "max": "",
+            "return_format": "object"
+        }
+    ],
+    "location": [
+        [
+            {
+                "param": "post_type",
+                "operator": "==",
+                "value": "announce"
+            }
+        ]
+    ],
+    "menu_order": 0,
+    "position": "normal",
+    "style": "default",
+    "label_placement": "top",
+    "instruction_placement": "label",
+    "hide_on_screen": "",
+    "active": 1,
+    "description": "",
+    "modified": 1531231867
+}
\ No newline at end of file
diff --git a/modules/label/filter/index.php b/modules/label/filter/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/label/filter/label.filter.php b/modules/label/filter/label.filter.php
new file mode 100644
index 0000000..d5a9dbe
--- /dev/null
+++ b/modules/label/filter/label.filter.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Action of Annonce module.
+ *
+ * @author    Eoxia <dev@eoxia.com>
+ * @copyright (c) 2006-2018 Eoxia <dev@eoxia.com>
+ * @license   AGPLv3 <https://spdx.org/licenses/AGPL-3.0-or-later.html>
+ * @package   Annonces\annonce\Filters
+ * @since     2.0.0
+ */
+
+namespace annonces;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Action of "Hello_World" module.
+ */
+class Label_Filters {
+
+	/**
+	 * Constructor
+	 *
+	 * @since 2.0.0
+	 * @version 2.0.0
+	 */
+	public function __construct() {
+		add_filter( 'acf/settings/load_json', array( $this, 'annonces_annonce_json_load' ) );
+		add_filter( 'single_template', array( $this, 'get_custom_post_type_template' ), 11 );
+	}
+
+	/**
+	 * Add a json acf directory
+	 *
+	 * @since  2.0.0
+	 * @param  Array $paths Acf folders.
+	 * @return Array $paths Acf folders
+	 */
+	public function annonces_annonce_json_load( $paths ) {
+		if ( \eoxia\Config_Util::$init['annonces']->label->state ) {
+			$paths[] = PLUGIN_ANNONCES_PATH . 'modules/label/asset/json';
+		}
+		return $paths;
+	}
+
+	/**
+	 * Get template for single post type
+	 *
+	 * @since  2.0.0
+	 * @param  string $single_template Template path.
+	 * @return string $single_template Template path.
+	 */
+	public function get_custom_post_type_template( $single_template ) {
+		global $post;
+
+		if ( 'label' === $post->post_type ) {
+			/** Get theme template if exist */
+			$path_to_theme = locate_template( 'single-label.php' );
+
+			if ( ! empty( $path_to_theme ) ) {
+				$single_template = $path_to_theme;
+			} else {
+				$single_template = str_replace( '\\', '/', PLUGIN_ANNONCES_PATH . '\modules\label\view\single-label.php' );
+			}
+		}
+
+		return $single_template;
+	}
+
+}
+
+new Label_Filters();
diff --git a/modules/label/index.php b/modules/label/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/label/label.config.json b/modules/label/label.config.json
new file mode 100644
index 0000000..bf2d464
--- /dev/null
+++ b/modules/label/label.config.json
@@ -0,0 +1,14 @@
+{
+    "name": "Label",
+    "slug": "label",
+    "version": "2.0.0",
+    "path": "modules/label",
+    "dependencies_func": [
+        "\\annonces\\is_acf"
+    ],
+    "dependencies": {
+        "action": {},
+        "filter": {}
+    },
+    "state": true
+}
\ No newline at end of file
diff --git a/modules/label/view/index.php b/modules/label/view/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/modules/label/view/main.view.php b/modules/label/view/main.view.php
new file mode 100644
index 0000000..d0ae708
--- /dev/null
+++ b/modules/label/view/main.view.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Main view of Annonce module.
+ *
+ * @author    Eoxia <dev@eoxia.com>
+ * @copyright (c) 2006-2018 Eoxia <dev@eoxia.com>
+ * @license   AGPLv3 <https://spdx.org/licenses/AGPL-3.0-or-later.html>
+ * @package   Annonces\annonce\Actions
+ * @since     2.0.0
+ */
+
+namespace annonces;
+
+defined( 'ABSPATH' ) || exit; ?>
diff --git a/modules/label/view/single-label.php b/modules/label/view/single-label.php
new file mode 100644
index 0000000..3edb80f
--- /dev/null
+++ b/modules/label/view/single-label.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Single Label view.
+ *
+ * @author    Eoxia <dev@eoxia.com>
+ * @copyright (c) 2006-2018 Eoxia <dev@eoxia.com>
+ * @license   AGPLv3 <https://spdx.org/licenses/AGPL-3.0-or-later.html>
+ * @package   Annonces\label\view\Single
+ * @since     2.0.0
+ */
+
+namespace annonces;
+
+defined( 'ABSPATH' ) || exit; ?>
+
+<?php get_header(); ?>
+
+	<div id="primary" class="content-area">
+		<main id="main" class="site-main" role="main">
+
+		<?php
+		while ( have_posts() ) : the_post();
+
+			?>
+			<div class="wpeo-gridlayout grid-4">
+				<figure class="label-thumbnail">
+					<?php the_post_thumbnail(); ?>
+				</figure>
+				<div class="label-content gridw-3">
+					<h1 class="page-title"><?php the_title(); ?></h1>
+					<?php the_content(); ?>
+
+					<ul class="label-metadatas">
+						<?php
+						$metadatas = get_field( 'organisation' );
+
+						if ( ! empty( $metadatas['website'] ) ) : ?>
+							<li class="annonce-data"><i class="fas fa-globe"></i> <strong><?php esc_html_e( 'Website', 'annonces' ); ?></strong> :
+								<a href="<?php echo esc_url( $metadatas['website'] ); ?>" target="_blank"><?php echo esc_html( $metadatas['website'] ); ?></a>
+							</li> <?php
+						endif;
+
+						if ( ! empty( $metadatas['email'] ) ) : ?>
+							<li class="annonce-data"><i class="fas fa-envelope"></i> <strong><?php esc_html_e( 'Email', 'annonces' ); ?></strong> : <?php echo esc_html( $metadatas['email'] ); ?></li> <?php
+						endif;
+
+						if ( ! empty( $metadatas['telephone'] ) ) : ?>
+							<li class="annonce-data"><i class="fas fa-mobile-alt"></i> <strong><?php esc_html_e( 'Phone number', 'annonces' ); ?></strong> : <?php echo esc_html( $metadatas['telephone'] ); ?></li> <?php
+						endif;
+
+						if ( ! empty( $metadatas['address'] ) ) : ?>
+						<li class="annonce-data"><i class="fas fa-map-marker-alt"></i> <strong><?php esc_html_e( 'Address', 'annonces' ); ?></strong> : <?php echo esc_html( $metadatas['address']['address'] ); ?></li> <?php
+						endif; ?>
+
+					</ul>
+
+					<?php
+					$labels = get_posts(array(
+						'post_type'  => 'announce',
+						'meta_query' => array(
+							array(
+								'key'     => 'labels',
+								'value'   => '"' . get_the_ID() . '"',
+								'compare' => 'LIKE',
+							),
+						),
+					));
+
+					if ( $labels ) : ?>
+						<div class="associated-announces">
+							<h2 class="associated-title"><?php esc_html_e( 'Associated announces', 'annonces' ); ?></h2>
+							<div class="associated-container wpeo-gridlayout grid-2">
+								<?php foreach ( $labels as $label ) :
+									$label_image = get_the_post_thumbnail( $label->ID );
+
+									$taxonomies = wp_get_post_terms( $label->ID, 'announce_taxonomy', array() );
+									$tax        = '';
+									if ( ! empty( $taxonomies ) ) :
+										foreach ( $taxonomies as $element ) :
+											$tax .= $element->name . ',';
+										endforeach;
+									endif;
+									$tax = substr( $tax, 0, -1 );
+									?>
+									<div class="associated-content wpeo-gridlayout grid-3 grid-gap-0">
+										<?php if ( ! empty( $label_image ) ) : ?>
+											<figure><a href="<?php echo esc_url( get_permalink( $label->ID ) ); ?>"><?php echo $label_image; ?></a></figure>
+										<?php endif; ?>
+										<div class="associated-element-content gridw-2">
+											<h3 class="element-title"><a href="<?php echo esc_url( get_permalink( $label->ID ) ); ?>"><?php echo esc_html( $label->post_title ); ?></a></h3>
+											<div class="element-tax"><?php echo esc_html( $tax ); ?></div>
+										</div>
+									</div>
+								<?php endforeach; ?>
+							</div><!-- .associated-container -->
+						</div><!-- .label-associated --> <?php
+					endif;
+					?>
+
+				</div>
+			</div>
+			<?php
+
+			/** Comments */
+			if ( comments_open() || get_comments_number() ) :
+				comments_template();
+			endif;
+
+		endwhile; // End of the loop.
+		?>
+
+		</main><!-- #main -->
+	</div><!-- #primary -->
+
+<?php
+get_sidebar();
+get_footer();
diff --git a/modules/option/action/option.action.php b/modules/option/action/option.action.php
index f634d6f..10294f1 100644
--- a/modules/option/action/option.action.php
+++ b/modules/option/action/option.action.php
@@ -26,7 +26,7 @@ class Option_Action {
 	 */
 	public function __construct() {
 		add_action( 'admin_menu', array( $this, 'callback_admin_menu' ) );
-		add_action( 'wp_ajax_save_annonces_google_key', array( $this, 'callback_save_annonces_google_key' ) );
+		add_action( 'wp_ajax_save_annonces_options', array( $this, 'callback_save_annonces_options' ) );
 		add_action( 'admin_init', array( $this, 'add_permalink_setting' ) );
 		add_action( 'load-options-permalink.php', array( $this, 'update_permalink_setting_value' ) );
 	}
@@ -48,7 +48,8 @@ public function callback_admin_menu() {
 	 * @version 2.0.0
 	 */
 	public function callback_add_menu_page() {
-		\eoxia\View_Util::exec( 'annonces', 'option', 'main' );
+		$display_label_value = get_option( 'annonces_display_label', true );
+		\eoxia\View_Util::exec( 'annonces', 'option', 'main', array( 'display_label_value' => $display_label_value ) );
 	}
 
 	/**
@@ -57,11 +58,15 @@ public function callback_add_menu_page() {
 	 * @since 2.0.0
 	 * @return void
 	 */
-	public function callback_save_annonces_google_key() {
-		check_ajax_referer( 'save_annonces_google_key' );
-		$google_key = ! empty( $_POST['annonces_google_key'] ) ? sanitize_text_field( $_POST['annonces_google_key'] ) : '';
+	public function callback_save_annonces_options() {
+		check_ajax_referer( 'save_annonces_options' );
+		$google_key    = ! empty( $_POST['annonces_google_key'] ) ? sanitize_text_field( $_POST['annonces_google_key'] ) : '';
+		$display_label = ( isset( $_POST['display_label'] ) && $_POST['display_label'] == 'true' ) ? true : false;
+
+		\eoxia\Module_Util::g()->set_state( 'annonces', 'label', $display_label );
 
 		update_option( 'annonces_google_key', $google_key );
+		update_option( 'annonces_display_label', $display_label );
 		wp_send_json_success();
 	}
 
diff --git a/modules/option/option.config.json b/modules/option/option.config.json
index 5dc0b8f..343e4be 100644
--- a/modules/option/option.config.json
+++ b/modules/option/option.config.json
@@ -1,12 +1,12 @@
-{
-	"name": "Option",
-	"slug": "option",
-	"version": "2.0.0",
-	"path": "modules/option",
-	"dependencies_func": [
-		"\\annonces\\is_acf"
-	],
-	"dependencies": {
-		"action": {}
-	}
-}
+{
+    "name": "Option",
+    "slug": "option",
+    "version": "2.0.0",
+    "path": "modules/option",
+    "dependencies_func": [
+        "\\annonces\\is_acf"
+    ],
+    "dependencies": {
+        "action": {}
+    }
+}
diff --git a/modules/option/view/main.view.php b/modules/option/view/main.view.php
index a3d7d5f..4d58127 100644
--- a/modules/option/view/main.view.php
+++ b/modules/option/view/main.view.php
@@ -17,8 +17,8 @@
 	<h1><?php esc_html_e( 'Announces options', 'annonces' ); ?></h1>
 
 	<div class="wpeo-form">
-		<input type="hidden" name="action" value="save_annonces_google_key" />
-		<?php wp_nonce_field( 'save_annonces_google_key' ); ?>
+		<input type="hidden" name="action" value="save_annonces_options" />
+		<?php wp_nonce_field( 'save_annonces_options' ); ?>
 
 		<div class="form-element">
 			<span class="form-label"><?php esc_html_e( 'Google api key', 'annonces' ); ?></span>
@@ -28,6 +28,18 @@
 			<span class="form-sublabel"><a href="https://developers.google.com/maps/documentation/javascript/get-api-key" target="_blank"><?php esc_html_e( 'Obtain a google map api key', 'annonces' ); ?></a></span>
 		</div>
 
+		<div class="form-element form-align-horizontal">
+			<span class="form-label"><?php esc_html_e( 'Display label module', 'annonces' ); ?></span>
+			<label class="form-field-container">
+				<div class="form-field-inline">
+					<input type="checkbox" id="display_label" class="form-field" name="display_label" <?php echo ( $display_label_value ) ? 'checked' : ''; ?>>
+					<label for="display_label"><?php esc_html_e( 'Activate', 'annonces' ); ?></label>
+				</div>
+			</label>
+			<span class="form-sublabel"><?php esc_html_e( 'Check to display the label module', 'annonces' ); ?></span>
+		</div>
+
+
 		<div class="wpeo-button button-blue action-input button-progress" data-parent="wpeo-form">
 			<span><?php esc_html_e( 'Update', 'annonces' ); ?></span>
 		</div>
diff --git a/readme.txt b/readme.txt
index 00adfc5..a113360 100644
--- a/readme.txt
+++ b/readme.txt
@@ -24,7 +24,7 @@ Display the Google Map in a page with the shortcode :
 
 = Change metadatas in infowindow of map =
 `
-add_filter(\'set_marker_data\', \'mytheme_set_marker_data\', 10, 2);
+add_filter('set_marker_data', 'mytheme_set_marker_data', 10, 2);
 function mytheme_set_marker_data($microdata, $annonce_id) {
     // datas
     return $microdata;
@@ -34,8 +34,8 @@ function mytheme_set_marker_data($microdata, $annonce_id) {
 = Change title of filter bloc over the map =
 
 `
-add_filter(\'bloc_filter_title\', \'mytheme_set_filter_title\', 10, 1);
-function mytheme_set_marker_data($filter_title) {
+add_filter('bloc_filter_title', 'mytheme_set_filter_title', 10, 1);
+function mytheme_set_filter_title($filter_title) {
     // datas
     return $filter_title;
 }
@@ -63,6 +63,20 @@ You can create single-announces.php in your child theme to edit the single page
 
 == Changelog ==
 
+= 2.1.0 =
+
+= Fix =
+
+* 20487 - Add condition ACF file existing or not to avoid errors
+* 20488 - Review the name of the filters on the documentation
+* 20489 - Add the Address field in the metadata (map & single)
+* 20492 - add the ACF filter to set the Google map API Key
+
+= Improvment =
+
+* 20498 - Improvement of the markers toggle script on the google map
+* 20491 - Improved mobile display for the filter block
+
 = 2.0.0 =
 
 = Improvment =