diff --git a/src/app/menu-phone/menu-phone.component.scss b/src/app/menu-phone/menu-phone.component.scss
index 75987578ef5d16697f119b1c0819cf7412d23ba2..ea2eb05ce33fcdd036046833e1590bac98cf6e57 100644
--- a/src/app/menu-phone/menu-phone.component.scss
+++ b/src/app/menu-phone/menu-phone.component.scss
@@ -25,7 +25,7 @@
   right: 0;
   width: 100%;
   height: 100%;
-  z-index: $modal-menu-phone-z-index;
+  z-index: $menu-phone-z-index;
   animation: slideMenu 0.5s;
   .contentMenu {
     background-color: $white;
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 4e98779cf926d18cb540833cd4a6341ed0cbff09..bb6b1f569582974b129248489f067e46d6a91371 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -1,5 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
 import { DateTime } from 'luxon';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -12,7 +13,7 @@ export class AuthService {
   private userSubject: BehaviorSubject<UserAuth>;
   public user: Observable<UserAuth>;
 
-  constructor(private http: HttpClient) {
+  constructor(private http: HttpClient, private router: Router) {
     this.userSubject = new BehaviorSubject<UserAuth>(JSON.parse(localStorage.getItem('user')));
     this.user = this.userSubject.asObservable();
   }
@@ -31,6 +32,7 @@ export class AuthService {
   public logout(): void {
     localStorage.removeItem('user');
     this.userSubject.next(null);
+    window.location.replace('/home');
   }
 
   public isLoggedIn(): boolean {
diff --git a/src/app/shared/components/modal/modal.component.scss b/src/app/shared/components/modal/modal.component.scss
index ec0dd8d35e72127edd81d971224dccdd67a95067..5d12fa7647408b644a3339d0dbd7ec6b085d915a 100644
--- a/src/app/shared/components/modal/modal.component.scss
+++ b/src/app/shared/components/modal/modal.component.scss
@@ -5,7 +5,7 @@
 @import '../../../../assets/scss/hyperlink';
 .cModal {
   position: fixed;
-  z-index: $modal-add-structure-z-index;
+  z-index: $modal-z-index;
   top: 0;
   right: 0;
   bottom: 0;
diff --git a/src/app/shared/components/signin-modal/signin-modal.component.scss b/src/app/shared/components/signin-modal/signin-modal.component.scss
index b65234fb3d7035bd0a406e3d617d3d3a3bd107e9..a73c0f1c2f0d29c8bf9352db5c3251ee1cdfde02 100644
--- a/src/app/shared/components/signin-modal/signin-modal.component.scss
+++ b/src/app/shared/components/signin-modal/signin-modal.component.scss
@@ -5,7 +5,7 @@
 @import '../../../../assets/scss/hyperlink';
 .cModal {
   position: fixed;
-  z-index: $modal-add-structure-z-index;
+  z-index: $modal-z-index;
   top: 0;
   right: 0;
   bottom: 0;
diff --git a/src/app/shared/components/signup-modal/signup-modal.component.scss b/src/app/shared/components/signup-modal/signup-modal.component.scss
index b65234fb3d7035bd0a406e3d617d3d3a3bd107e9..a73c0f1c2f0d29c8bf9352db5c3251ee1cdfde02 100644
--- a/src/app/shared/components/signup-modal/signup-modal.component.scss
+++ b/src/app/shared/components/signup-modal/signup-modal.component.scss
@@ -5,7 +5,7 @@
 @import '../../../../assets/scss/hyperlink';
 .cModal {
   position: fixed;
-  z-index: $modal-add-structure-z-index;
+  z-index: $modal-z-index;
   top: 0;
   right: 0;
   bottom: 0;
diff --git a/src/app/structure-list/components/modal-filter/modal-filter.component.scss b/src/app/structure-list/components/modal-filter/modal-filter.component.scss
index dcd0cd49035f365ed114958ec4d08b8f7a04df52..247ab736150c4e47de06114c05e836feb60b3343 100644
--- a/src/app/structure-list/components/modal-filter/modal-filter.component.scss
+++ b/src/app/structure-list/components/modal-filter/modal-filter.component.scss
@@ -22,7 +22,7 @@
 .modal {
   max-width: 754px;
   width: 94%;
-  z-index: $modal-filter-structure-z-index !important;
+  z-index: $modal-z-index !important;
   position: fixed;
   border-radius: 6px;
   margin-top: 3.5px;
diff --git a/src/assets/scss/_z-index.scss b/src/assets/scss/_z-index.scss
index 1f6dbcd22289984b44529458df1b94e40d7cfb2d..a9230fbd4da7814c07407923abced79e6a5c7f48 100644
--- a/src/assets/scss/_z-index.scss
+++ b/src/assets/scss/_z-index.scss
@@ -1,5 +1,9 @@
-$structure-details-z-index: 1002;
-$modal-add-structure-z-index: 1002;
-$modal-filter-structure-z-index: 1002;
-$modal-menu-phone-z-index: 1002;
-$btn-phone-switch-map-list-z-index: 1001;
+// Phone view
+$btn-phone-switch-map-list-z-index: 1002;
+$menu-phone-z-index: 1003;
+
+// Structure details
+$structure-details-z-index: 1001;
+
+// Modals (filters/confirmationPopup/authen/...)
+$modal-z-index: 1002;