diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index b5c193e7e..c28c00141 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -182,6 +182,10 @@ div.pagination {
   text-align: center;
 }
 
+.alert{
+  margin-bottom: 0px;
+}
+
 .alert.alert-success.move_up {
   position: absolute;
   top: 0px;
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index cdc617695..6ed7c1bc6 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -3,15 +3,11 @@
 = image_tag('marianne_small.png', class: 'logo')
 %a{href: '/'}
   = image_tag('logo-tps.png', class: 'logo')
-%a{href: '/'}
-  -if gestionnaire_signed_in?
-    %span{ style: 'margin-left: 25px;' }
-      %b
-        Mes Dossiers
+%a{href: '/', class: 'btn btn-md'}
+  -if gestionnaire_signed_in? || user_signed_in?
+    Mes Dossiers
   -elsif administrateur_signed_in?
-    %span{ style: 'margin-left: 25px;' }
-      %b
-        Mes Procédures
+    Mes Procédures
 #sign_out
   -if gestionnaire_signed_in?
     = render partial: 'gestionnaires/login_banner'
@@ -35,11 +31,3 @@
     = link_to "Utilisateur", '/users/sign_in', method: :get, :class => 'btn btn-md'
     = link_to "Accompagnateur", '/gestionnaires/sign_in', method: :get, :class => 'btn btn-md'
     = link_to "Administrateur", '/administrateurs/sign_in', method: :get, :class => 'btn btn-md'
-
-#flash_message.center
-- if flash.notice
-  .alert.alert-success
-    = flash.notice
-- if flash.alert
-  .alert.alert-danger
-    = flash.alert
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 5382edc73..440c59544 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -14,6 +14,13 @@
       %div#header.navbar
         =render partial: "layouts/navbar"
 
+      #flash_message.center
+      - if flash.notice
+        .alert.alert-success
+          = flash.notice
+      - if flash.alert
+        .alert.alert-danger
+          = flash.alert
       #main_div.main_div
         = yield