diff --git a/templates/admin_activate.html b/templates/admin_activate.html
index 3390d66..0e9d8be 100644
--- a/templates/admin_activate.html
+++ b/templates/admin_activate.html
@@ -12,14 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li>&lt;&ngsp; <a href="#">Compte</a>
+<li>&lt;&nbsp;<a href="#">Compte</a>
   <ul class="submenu">
     <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>
 {{else}}
-<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
+<li> &lt;&nbsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/admin_create.html b/templates/admin_create.html
index 07bc90c..b736172 100644
--- a/templates/admin_create.html
+++ b/templates/admin_create.html
@@ -12,14 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li>&lt;&ngsp; <a href="#">Compte</a>
+<li>&lt;&nbsp;<a href="#">Compte</a>
   <ul class="submenu">
     <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>
 {{else}}
-<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
+<li> &lt;&nbsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/admin_groups.html b/templates/admin_groups.html
index 32f8d22..0a4c4b8 100644
--- a/templates/admin_groups.html
+++ b/templates/admin_groups.html
@@ -12,14 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li>&lt;&ngsp; <a href="#">Compte</a>
+<li>&lt;&nbsp;<a href="#">Compte</a>
   <ul class="submenu">
     <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>
 {{else}}
-<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
+<li> &lt;&nbsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/admin_ldap.html b/templates/admin_ldap.html
index b773e43..f73e502 100644
--- a/templates/admin_ldap.html
+++ b/templates/admin_ldap.html
@@ -12,14 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li>&lt;&ngsp; <a href="#">Compte</a>
+<li>&lt;&nbsp;<a href="#">Compte</a>
   <ul class="submenu">
     <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>
 {{else}}
-<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
+<li> &lt;&nbsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/admin_mailing.html b/templates/admin_mailing.html
index f5b6d1c..d7bccbd 100644
--- a/templates/admin_mailing.html
+++ b/templates/admin_mailing.html
@@ -12,14 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li>&lt;&ngsp; <a href="#">Compte</a>
+<li>&lt;&nbsp;<a href="#">Compte</a>
   <ul class="submenu">
     <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>
 {{else}}
-<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
+<li> &lt;&nbsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/admin_mailing_list.html b/templates/admin_mailing_list.html
index c38f3ca..08b1ac9 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> &lt;&ngsp;<a href="#">Se connecter</a>
+<li> &lt;&nbsp;<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 e71519e..a841415 100644
--- a/templates/admin_users.html
+++ b/templates/admin_users.html
@@ -12,14 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li>&lt;&ngsp; <a href="#">Compte</a>
+<li>&lt;&nbsp;<a href="#">Compte</a>
   <ul class="submenu">
     <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>
 {{else}}
-<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
+<li> &lt;&nbsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/directory.html b/templates/directory.html
index 38e9c8b..690ac3e 100644
--- a/templates/directory.html
+++ b/templates/directory.html
@@ -12,14 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li>&lt;&ngsp; <a href="#">Compte</a>
+<li>&lt;&nbsp;<a href="#">Compte</a>
   <ul class="submenu">
     <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>
 {{else}}
-<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
+<li> &lt;&nbsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}
 
diff --git a/templates/garage_key.html b/templates/garage_key.html
index edcf2e0..62497c2 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> &lt;&ngsp;<a href="#">Se connecter</a>
+<li> &lt;&nbsp;<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 187c422..af6fc31 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> &lt;&ngsp;<a href="#">Se connecter</a>
+<li> &lt;&nbsp;<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 8be3a09..d20ff2c 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> &lt;&ngsp;<a href="#">Se connecter</a>
+<li> &lt;&nbsp;<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 63fa902..7e73905 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> &lt;&ngsp;<a href="#">Se connecter</a>
+<li> &lt;&nbsp;<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 c5bbedd..bcc01ef 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -11,16 +11,6 @@
 </ul>
 </li>
 {{end}}
-{{if .Login}}
-<li>&lt;&ngsp; <a href="#">Compte</a>
-  <ul class="submenu">
-    <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>
-{{else}}
-<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
-{{end}}
 {{end}}
 
 {{define "body"}}
diff --git a/templates/invite_invalid_code.html b/templates/invite_invalid_code.html
index fd914be..4248b67 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> &lt;&ngsp;<a href="#">Se connecter</a>
+<li> &lt;&nbsp;<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 53a6be7..9a404ee 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> &lt;&ngsp;<a href="#">Se connecter</a>
+<li> &lt;&nbsp;<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 aa3d45f..0d75d9a 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -55,14 +55,18 @@
           </ul></li>
           <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>
-              <li><a href="/passwd">Modifier mon mot de passe</a></li>
-              </li>
-            </ul>
-          </li>
+              {{if .Login}}
+                  <a href="/logout">Se déconnecter</a>
+                  <li><a href="/">Tableau de bord</a></li>
+                  <li><a href="/profile">Modifier mon profil</a></li>
+                  <li><a href="/passwd">Modifier mon mot de passe</a></li>
+              {{else}}
+              <li><a href="/">Se connecter</a></li>
+              <li><a href="/gpas">Mal de passe oublié</a></li>
+              <li><a href="/invite/new_account">S'enregistrer</a></li>
+              {{end}}
+            </ul></li>
           <li> &nbsp;&lt;&nbsp;<a href="#" class="jour-nuit" id="jour-nuit">Jour et nuit</a></li>
-          
         </ul>
         
       </div>
diff --git a/templates/login.html b/templates/login.html
index 58ceae8..56e36e7 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,7 +1,7 @@
 {{define "title"}}LesGV.com{{end}}
 
 {{define "admenu"}}
-<li> &lt;&ngsp;<a href="#">Se connecter</a>
+<li> &lt;&nbsp;<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 79fa87e..6e04be2 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> &lt;&ngsp;<a href="#">Se connecter</a>
+<li> &lt;&nbsp;<a href="#">Se connecter</a>
 {{end}}
 
 {{define "body"}}
diff --git a/templates/password_lost.html b/templates/password_lost.html
index 26310a7..da47e92 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> &lt;&ngsp;<a href="#">Se connecter</a>
+<li> &lt;&nbsp;<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 75391cb..5dec1b2 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -12,14 +12,14 @@
 </li>
 {{end}}
 {{if .Login}}
-<li>&lt;&ngsp; <a href="#">Compte</a>
+<li>&lt;&nbsp;<a href="#">Compte</a>
   <ul class="submenu">
     <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>
 {{else}}
-<li> &lt;&ngsp;<a href="/">Se connecter</a></li>
+<li> &lt;&nbsp;<a href="/">Se connecter</a></li>
 {{end}}
 {{end}}