diff --git a/templates/admin_activate.html b/templates/admin_activate.html
index 5d5cfe5..3390d66 100644
--- a/templates/admin_activate.html
+++ b/templates/admin_activate.html
@@ -12,15 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li><a href="/logout">Se déconnecter</a></li>
-{{else}}
-<li><a href="#">Se connecter</a>
+<li>&lt;&ngsp; <a href="#">Compte</a>
   <ul class="submenu">
-    <li><a href="/">Se connecter</a></li>
+    <a href="/logout">Se déconnecter</a>
     <li><a href="/gpas">Mal de passe oublié</a></li>
     <li><a href="/invite/new_account">S'enregistrer</a></li>
-  </ul>
-</li>
+  </ul></li>
+{{else}}
+<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/admin_create.html b/templates/admin_create.html
index 32418f2..07bc90c 100644
--- a/templates/admin_create.html
+++ b/templates/admin_create.html
@@ -12,15 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li><a href="/logout">Se déconnecter</a></li>
-{{else}}
-<li><a href="#">Se connecter</a>
+<li>&lt;&ngsp; <a href="#">Compte</a>
   <ul class="submenu">
-    <li><a href="/">Se connecter</a></li>
+    <a href="/logout">Se déconnecter</a>
     <li><a href="/gpas">Mal de passe oublié</a></li>
     <li><a href="/invite/new_account">S'enregistrer</a></li>
-  </ul>
-</li>
+  </ul></li>
+{{else}}
+<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/admin_groups.html b/templates/admin_groups.html
index d185650..32f8d22 100644
--- a/templates/admin_groups.html
+++ b/templates/admin_groups.html
@@ -12,15 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li><a href="/logout">Se déconnecter</a></li>
-{{else}}
-<li><a href="#">Se connecter</a>
+<li>&lt;&ngsp; <a href="#">Compte</a>
   <ul class="submenu">
-    <li><a href="/">Se connecter</a></li>
+    <a href="/logout">Se déconnecter</a>
     <li><a href="/gpas">Mal de passe oublié</a></li>
     <li><a href="/invite/new_account">S'enregistrer</a></li>
-  </ul>
-</li>
+  </ul></li>
+{{else}}
+<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/admin_ldap.html b/templates/admin_ldap.html
index 49ce094..b773e43 100644
--- a/templates/admin_ldap.html
+++ b/templates/admin_ldap.html
@@ -12,15 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li><a href="/logout">Se déconnecter</a></li>
-{{else}}
-<li><a href="#">Se connecter</a>
+<li>&lt;&ngsp; <a href="#">Compte</a>
   <ul class="submenu">
-    <li><a href="/">Se connecter</a></li>
+    <a href="/logout">Se déconnecter</a>
     <li><a href="/gpas">Mal de passe oublié</a></li>
     <li><a href="/invite/new_account">S'enregistrer</a></li>
-  </ul>
-</li>
+  </ul></li>
+{{else}}
+<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/admin_mailing.html b/templates/admin_mailing.html
index f38b4fd..f5b6d1c 100644
--- a/templates/admin_mailing.html
+++ b/templates/admin_mailing.html
@@ -2,8 +2,9 @@
 
 {{define "admenu"}}
 {{if .Login.CanAdmin}}
-<li><a href="/admin/activate">Administrer LDAP</a>
+<li><a href="#">Administration</a>
 <ul class="submenu">
+  <li><a href="/admin/activate">Administrer LDAP</a>
   <li><a href="/admin/activate">Activer des Utilisateur·ices</a></li>
   <li><a href="/admin/users">Utilisateur·ices</a></li>
   <li><a href="/admin/groups">Groupes</a></li>
@@ -11,15 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li><a href="/logout">Se déconnecter</a></li>
-{{else}}
-<li><a href="#">Se connecter</a>
+<li>&lt;&ngsp; <a href="#">Compte</a>
   <ul class="submenu">
-    <li><a href="/">Se connecter</a></li>
+    <a href="/logout">Se déconnecter</a>
     <li><a href="/gpas">Mal de passe oublié</a></li>
     <li><a href="/invite/new_account">S'enregistrer</a></li>
-  </ul>
-</li>
+  </ul></li>
+{{else}}
+<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/admin_mailing_list.html b/templates/admin_mailing_list.html
index 3533c68..c38f3ca 100644
--- a/templates/admin_mailing_list.html
+++ b/templates/admin_mailing_list.html
@@ -12,7 +12,7 @@
 {{if .Login}}
 <li><a href="/logout">Se déconnecter</a></li>
 {{else}}
-<li><a href="#">Se connecter</a>
+<li> &lt;&ngsp;<a href="#">Se connecter</a>
   <ul class="submenu">
     <li><a href="/">Se connecter</a></li>
     <li><a href="/gpas">Mal de passe oublié</a></li>
diff --git a/templates/admin_users.html b/templates/admin_users.html
index e065a49..e71519e 100644
--- a/templates/admin_users.html
+++ b/templates/admin_users.html
@@ -12,15 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li><a href="/logout">Se déconnecter</a></li>
-{{else}}
-<li><a href="#">Se connecter</a>
+<li>&lt;&ngsp; <a href="#">Compte</a>
   <ul class="submenu">
-    <li><a href="/">Se connecter</a></li>
+    <a href="/logout">Se déconnecter</a>
     <li><a href="/gpas">Mal de passe oublié</a></li>
     <li><a href="/invite/new_account">S'enregistrer</a></li>
-  </ul>
-</li>
+  </ul></li>
+{{else}}
+<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/directory.html b/templates/directory.html
index 799453e..38e9c8b 100644
--- a/templates/directory.html
+++ b/templates/directory.html
@@ -1,8 +1,10 @@
 {{define "title"}}Annuaire |{{end}}
+
 {{define "admenu"}}
 {{if .Login.CanAdmin}}
-<li><a href="/admin/activate">Administrer LDAP</a>
+<li><a href="#">Administration</a>
 <ul class="submenu">
+  <li><a href="/admin/activate">Administrer LDAP</a>
   <li><a href="/admin/activate">Activer des Utilisateur·ices</a></li>
   <li><a href="/admin/users">Utilisateur·ices</a></li>
   <li><a href="/admin/groups">Groupes</a></li>
@@ -10,24 +12,16 @@
 </li>
 {{end}}
 {{if .Login}}
-<li><a href="/logout">Se déconnecter</a></li>
-{{else}}
-<li><a href="#">Se connecter</a>
+<li>&lt;&ngsp; <a href="#">Compte</a>
   <ul class="submenu">
-    <li><a href="/">Se connecter</a></li>
+    <a href="/logout">Se déconnecter</a>
     <li><a href="/gpas">Mal de passe oublié</a></li>
     <li><a href="/invite/new_account">S'enregistrer</a></li>
-  </ul>
-</li>
+  </ul></li>
+{{else}}
+<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
-{{define "body"}}
-<div class="d-flex">
-    <h4>Annuaire</h4>
-    <a class="ml-auto btn btn-info" href="/">Menu principal</a>
-</div>
-
-
 
 <form>
   <div class="form-group form-row">
diff --git a/templates/garage_key.html b/templates/garage_key.html
index 51dc81c..edcf2e0 100644
--- a/templates/garage_key.html
+++ b/templates/garage_key.html
@@ -12,7 +12,7 @@
 {{if .Login}}
 <li><a href="/logout">Se déconnecter</a></li>
 {{else}}
-<li><a href="#">Se connecter</a>
+<li> &lt;&ngsp;<a href="#">Se connecter</a>
   <ul class="submenu">
     <li><a href="/">Se connecter</a></li>
     <li><a href="/gpas">Mal de passe oublié</a></li>
diff --git a/templates/garage_website_inspect.html b/templates/garage_website_inspect.html
index 21b424d..187c422 100644
--- a/templates/garage_website_inspect.html
+++ b/templates/garage_website_inspect.html
@@ -12,7 +12,7 @@
 {{if .Login}}
 <li><a href="/logout">Se déconnecter</a></li>
 {{else}}
-<li><a href="#">Se connecter</a>
+<li> &lt;&ngsp;<a href="#">Se connecter</a>
   <ul class="submenu">
     <li><a href="/">Se connecter</a></li>
     <li><a href="/gpas">Mal de passe oublié</a></li>
diff --git a/templates/garage_website_list.html b/templates/garage_website_list.html
index 6f87df4..8be3a09 100644
--- a/templates/garage_website_list.html
+++ b/templates/garage_website_list.html
@@ -12,7 +12,7 @@
 {{if .Login}}
 <li><a href="/logout">Se déconnecter</a></li>
 {{else}}
-<li><a href="#">Se connecter</a>
+<li> &lt;&ngsp;<a href="#">Se connecter</a>
   <ul class="submenu">
     <li><a href="/">Se connecter</a></li>
     <li><a href="/gpas">Mal de passe oublié</a></li>
diff --git a/templates/garage_website_new.html b/templates/garage_website_new.html
index e7d5848..63fa902 100644
--- a/templates/garage_website_new.html
+++ b/templates/garage_website_new.html
@@ -12,7 +12,7 @@
 {{if .Login}}
 <li><a href="/logout">Se déconnecter</a></li>
 {{else}}
-<li><a href="#">Se connecter</a>
+<li> &lt;&ngsp;<a href="#">Se connecter</a>
   <ul class="submenu">
     <li><a href="/">Se connecter</a></li>
     <li><a href="/gpas">Mal de passe oublié</a></li>
diff --git a/templates/home.html b/templates/home.html
index 67793fd..c5bbedd 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -12,15 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li><a href="/logout">Se déconnecter</a></li>
-{{else}}
-<li><a href="#">Se connecter</a>
+<li>&lt;&ngsp; <a href="#">Compte</a>
   <ul class="submenu">
-    <li><a href="/">Se connecter</a></li>
+    <a href="/logout">Se déconnecter</a>
     <li><a href="/gpas">Mal de passe oublié</a></li>
     <li><a href="/invite/new_account">S'enregistrer</a></li>
-  </ul>
-</li>
+  </ul></li>
+{{else}}
+<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/invite_invalid_code.html b/templates/invite_invalid_code.html
index 9eb9a08..fd914be 100644
--- a/templates/invite_invalid_code.html
+++ b/templates/invite_invalid_code.html
@@ -1,7 +1,7 @@
 {{define "title"}}Créer un compte |{{end}}
 
 {{define "admenu"}}
-<li><a href="#">Se connecter</a>
+<li> &lt;&ngsp;<a href="#">Se connecter</a>
   <ul class="submenu">
     <li><a href="/">Se connecter</a></li>
     <li><a href="/gpas">Mal de passe oublié</a></li>
diff --git a/templates/invite_send_code.html b/templates/invite_send_code.html
index a52d4c0..53a6be7 100644
--- a/templates/invite_send_code.html
+++ b/templates/invite_send_code.html
@@ -1,6 +1,6 @@
 {{define "title"}}Envoyer un code d'invitation |{{end}}
 {{define "admenu"}}
-<li><a href="#">Se connecter</a>
+<li> &lt;&ngsp;<a href="#">Se connecter</a>
   <ul class="submenu">
     <li><a href="/">Se connecter</a></li>
     <li><a href="/gpas">Mal de passe oublié</a></li>
diff --git a/templates/layout.html b/templates/layout.html
index 257f0f6..aa3d45f 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -53,7 +53,7 @@
             <li><a href="https://wiki.lesgrandsvoisins.com">Wiki</a></li>
             <li><a href="https://www.lesgrandsvoisins.com/admin">Admin</a></li>
           </ul></li>
-          <li><a href="#">Compte</a>
+          <li>&lt;&nbsp;<a href="#">Compte</a>
             <ul class="submenu">
               <li><a href="/">Tableau de bord</a></li>
               <li><a href="/profile">Modifier mon profil</a></li>
diff --git a/templates/login.html b/templates/login.html
index 673d84d..58ceae8 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,7 +1,7 @@
 {{define "title"}}LesGV.com{{end}}
 
 {{define "admenu"}}
-<li><a href="#">Se connecter</a>
+<li> &lt;&ngsp;<a href="#">Se connecter</a>
   <ul class="submenu">
     <li><a href="/">Se connecter</a></li>
     <li><a href="/gpas">Mal de passe oublié</a></li>
diff --git a/templates/passwd.html b/templates/passwd.html
index d8843b8..79fa87e 100644
--- a/templates/passwd.html
+++ b/templates/passwd.html
@@ -2,7 +2,7 @@
 
 {{define "admenu"}}
 <li><a href="/logout">Se déconnecter</a></li>
-<li><a href="#">Se connecter</a>
+<li> &lt;&ngsp;<a href="#">Se connecter</a>
 {{end}}
 
 {{define "body"}}
diff --git a/templates/password_lost.html b/templates/password_lost.html
index 5bcbb18..26310a7 100644
--- a/templates/password_lost.html
+++ b/templates/password_lost.html
@@ -1,7 +1,7 @@
 {{define "title"}}G Pas | Je n'ai pas mon mal de passe{{end}}
 
 {{define "admenu"}}
-<li><a href="#">Se connecter</a>
+<li> &lt;&ngsp;<a href="#">Se connecter</a>
   <ul class="submenu">
     <li><a href="/">Se connecter</a></li>
     <li><a href="/gpas">Mal de passe oublié</a></li>
diff --git a/templates/profile.html b/templates/profile.html
index 350c2b1..75391cb 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -12,15 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li><a href="/logout">Se déconnecter</a></li>
-{{else}}
-<li><a href="#">Se connecter</a>
+<li>&lt;&ngsp; <a href="#">Compte</a>
   <ul class="submenu">
-    <li><a href="/">Se connecter</a></li>
+    <a href="/logout">Se déconnecter</a>
     <li><a href="/gpas">Mal de passe oublié</a></li>
     <li><a href="/invite/new_account">S'enregistrer</a></li>
-  </ul>
-</li>
+  </ul></li>
+{{else}}
+<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}