diff --git a/public/index.html b/public/index.html
index bf81abbcae21b265ed11b24c7af08383604145a2..81a966830c494ff1621342f894af73bc9a031577 100644
--- a/public/index.html
+++ b/public/index.html
@@ -13,7 +13,11 @@
     <noscript>
       <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
-    <div id="app"></div>
+    <div id="app">
+      <div class="ui active dimmer">
+        <div class="ui indeterminate text loader">En cours de chargement ...</div>
+      </div>
+    </div>
     <!-- built files will be auto injected -->
   </body>
 </html>
diff --git a/src/components/project/ProjectMappingContextLayer.vue b/src/components/project/ProjectMappingContextLayer.vue
index 12bbd9f74c32e8c32a4cdc3a3e8b02f42850e638..9a766ca27c1a80d0ffb2ec5f67187d951db2179b 100644
--- a/src/components/project/ProjectMappingContextLayer.vue
+++ b/src/components/project/ProjectMappingContextLayer.vue
@@ -68,20 +68,25 @@ export default {
     selectedLayer: {
       get() {
         const matchingLayer = this.retrieveLayer(this.layer.title);
-        return {
-          name: matchingLayer ? matchingLayer.service : "",
-          value: this.layer ? this.layer.title : "",
-        };
+        if (matchingLayer != undefined){
+          return {
+            name: matchingLayer != undefined ? matchingLayer.service : "",
+            value: this.layer ? this.layer.title : "",
+          };
+        }
+        return []
       },
 
       set(newValue) {
-        const matchingLayer = this.retrieveLayer(this.layer.title);
-        this.updateLayer({
-          ...this.layer,
-          service: newValue.name,
-          title: newValue.value,
-          id: matchingLayer.id,
-        });
+        const matchingLayer = this.retrieveLayer(newValue.title);
+        if (matchingLayer != undefined){
+          this.updateLayer({
+            ...this.layer,
+            service: newValue.name,
+            title: newValue.value,
+            id:  matchingLayer.id,
+          });
+        }
       },
     },
 
@@ -96,7 +101,7 @@ export default {
 
     availableLayers: function () {
       return this.layers.map((el) => {
-        return { name: el.service, value: el.title };
+        return { id: el.id, name: el.service, value: el.title, title: el.title };
       });
     },
 
@@ -109,7 +114,7 @@ export default {
 
   methods: {
     retrieveLayer(title) {
-     return this.layers.find((el) => el.title === title);
+      return this.layers.find((el) => el.title === title);
     },
 
     removeLayer() {
@@ -130,12 +135,14 @@ export default {
 
   mounted() {
     const matchingLayer = this.retrieveLayer(this.layer.title);
-    this.updateLayer({
-      ...this.layer,
-      service: matchingLayer.service,
-      title: matchingLayer.title,
-      id: matchingLayer.id,
-    });
+    if (matchingLayer != undefined){
+      this.updateLayer({
+        ...this.layer,
+        service: matchingLayer.service,
+        title: matchingLayer.title,
+        id: matchingLayer.id,
+      });
+    }
   },
 };
 </script>
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 64791f0a7a06b86f164c2d088c9f13daf3dc115c..225a436baf70bef89896a64b107a05b8ab33f0c1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -179,6 +179,7 @@ export default new Vuex.Store({
     },
 
     LOGOUT({ commit }) {
+      const pageNoRedirect = ["liste-signalements", "details-type-signalement", "details-signalement", "project_detail", "mentions", "aide", "index"]
       axios
         .get(`${this.state.configuration.VUE_APP_DJANGO_API_BASE}logout/`)
         .then((response) => {
@@ -186,7 +187,7 @@ export default new Vuex.Store({
             commit("SET_USER", false);
             commit("SET_USER_LEVEL_PROJECTS", null);
             commit("SET_USER_PERMISSIONS", null);
-            router.push("/");
+            if (!pageNoRedirect.includes(router.history.current.name)) router.push("/");
           }
         })
         .catch((error) => {
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 083bbb453dafecdbee11ead4bab3b5056f34bf58..719eb697116a3ff7bc211f4bd0a8093de6ab34fc 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -99,7 +99,9 @@ const map = {
     GET_BASEMAPS({ commit }, project_slug) {
       return axios
         .get(`${this.state.configuration.VUE_APP_DJANGO_API_BASE}base-maps/?project__slug=${project_slug}`)
-        .then((response) => (commit("SET_BASEMAPS", response.data)))
+        .then((response) => {
+          commit("SET_BASEMAPS", response.data)
+        })
         .catch((error) => {
           throw error;
         });
diff --git a/src/views/flatpages/Default.vue b/src/views/flatpages/Default.vue
index af38296848360fd63ff2959cb145688a120ce05a..9c8443814c424080936686fbc796b77fc955070d 100644
--- a/src/views/flatpages/Default.vue
+++ b/src/views/flatpages/Default.vue
@@ -1,7 +1,6 @@
 <template>
   <div v-if="flatpage" class="row">
     <div class="ten wide column">
-      {{ this.$route.params.url }}
       <h1>{{ flatpage.title }}</h1>
       <div v-html="flatpage.content"></div>
     </div>
@@ -9,13 +8,17 @@
 </template>
 
 <script>
+import { mapState } from "vuex";
+
 export default {
   name: "Default",
+
   computed: {
+    ...mapState(["staticPages"]),
     flatpage() {
-      if (this.$store.state.staticPages) {
-        return this.$store.state.staticPages.find(
-          (page) => page.url === this.$route.path
+      if (this.staticPages) {
+        return this.staticPages.find(
+          (page) => page.url === `/${this.$route.name}/`
         );
       }
       return null;
diff --git a/src/views/flatpages/with_right_menu.vue b/src/views/flatpages/with_right_menu.vue
index 645789602cf33c1172b03956d752edc0d29ed58f..c04a20b34a1990deba6f54b482f0eb40f0ec27c7 100644
--- a/src/views/flatpages/with_right_menu.vue
+++ b/src/views/flatpages/with_right_menu.vue
@@ -23,18 +23,23 @@
 </template>
 
 <script>
+import { mapState } from "vuex";
+
 export default {
   name: "With_right_menu",
+
   data() {
     return {
       sections: [],
     };
   },
+
   computed: {
+    ...mapState(["staticPages"]),
     flatpage() {
-      if (this.$store.state.staticPages) {
-        return this.$store.state.staticPages.find(
-          (page) => page.url === this.$route.path
+      if (this.staticPages) {
+        return this.staticPages.find(
+          (page) => page.url === `/${this.$route.name}/`
         );
       }
       return null;
diff --git a/src/views/project/Project_mapping.vue b/src/views/project/Project_mapping.vue
index 3621e2d8ce1edf5590a23ab97f877c8ccc612b54..0a94b5a82f1f41a2ff965afbc1bb64a88b867b04 100644
--- a/src/views/project/Project_mapping.vue
+++ b/src/views/project/Project_mapping.vue
@@ -21,7 +21,7 @@
         </a>
       </div>
 
-      <div class="ui">
+      <div v-if="basemaps" class="ui">
         <ProjectMappingBasemap
           v-for="basemap in basemaps"
           :key="basemap.id"