diff --git a/kfet/signals.py b/kfet/signals.py
index 77c114e3..e81f264a 100644
--- a/kfet/signals.py
+++ b/kfet/signals.py
@@ -13,6 +13,6 @@ def messages_on_login(sender, request, user, **kwargs):
             'k-fet' in request.GET.get('next', '')):
         messages.info(
             request,
-            ('<a href="{}">Connexion en utilisateur partagé ?</a>'
+            ('<a href="{}" target="_blank">Connexion en utilisateur partagé ?</a>'
              .format(reverse('kfet.login.genericteam'))),
             extra_tags='safe')
diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css
index 04bb438e..50d2cae8 100644
--- a/kfet/static/kfet/css/index.css
+++ b/kfet/static/kfet/css/index.css
@@ -70,6 +70,10 @@ textarea {
     padding:8px 30px;
 }
 
+.btn {
+    transition: background-color 0.3s, color 0.3s;
+}
+
 .btn, .btn-lg, .btn-group-lg>.btn {
     border-radius:0;
 }
@@ -188,10 +192,14 @@ textarea {
     position:relative;
 }
 
-.content-right-block > div:not(.buttons-title) {
+.content-right-block > *:not(.buttons-title) {
     background: #fff;
 }
 
+.content-right-block > h2 {
+    background: transparent !important;
+}
+
 .content-right-block .buttons-title {
     position:absolute;
     top:8px;
@@ -220,13 +228,13 @@ textarea {
  * Pages tableaux seuls
  */
 
-.content-center {
-    background:#fff;
+.content-center > *:not(.content-right-block) {
+    background: #fff;
 }
 
 @media (min-width: 992px) {
     .content-center {
-        margin: 15px;
+        margin: 15px 0;
     }
 }
 
@@ -255,15 +263,12 @@ textarea {
  * Pages formulaires seuls
  */
 
-.form-only .content-form {
-    margin:15px;
-
-    background:#fff;
-
-    padding:15px;
+.content-form {
+    background-color: #fff;
+    padding: 15px;
 }
 
-.form-only .account_create #id_trigramme {
+.account_create #id_trigramme {
     display:block;
     width:200px;
     height:80px;
@@ -329,6 +334,10 @@ textarea {
  * Messages
  */
 
+.messages {
+    margin: 0;
+}
+
 .messages .alert {
     padding:10px 15px;
     margin:0;
@@ -566,10 +575,6 @@ thead .tooltip {
     }
 }
 
-.help-block {
-    padding-top: 15px;
-}
-
 /* Inventaires */
 
 #inventoryform input[type=number] {
diff --git a/kfet/static/kfet/css/nav.css b/kfet/static/kfet/css/nav.css
index 5ffc7b24..1802c50a 100644
--- a/kfet/static/kfet/css/nav.css
+++ b/kfet/static/kfet/css/nav.css
@@ -1,67 +1,80 @@
-nav {
-    background:#000;
-    color:#DDD;
-    font-family:Oswald;
+.navbar {
+    background: #000;
+    color: #DDD;
+    font-family: Oswald;
+    border: 0;
 }
 
-.navbar-nav > li > .dropdown-menu {
-    border:0;
-    border-radius:0;
+.navbar .navbar-brand {
+    padding: 3px 25px;
 }
 
-.navbar-fixed-top {
-    border:0;
+.navbar .navbar-brand img {
+    height: 44px;
 }
 
-nav .navbar-brand {
-    padding:3px 25px;
-}
-
-nav .navbar-brand img {
-    height:44px;
-}
-
-nav .navbar-toggle .icon-bar {
-    background-color:#FFF;
-}
-
-nav a {
-    color:#DDD;
+.navbar .navbar-toggle .icon-bar {
+    background-color: #FFF;
 }
 
 .navbar-nav {
-    font-weight:bold;
-    font-size:14px;
-    text-transform:uppercase;
+    font-weight: bold;
+    font-size: 14px;
+    text-transform: uppercase;
+    margin: 0 -15px;
 }
 
-.nav>li>a:focus, .nav>li>a:hover {
-    background-color:#C8102E;
-    color:#FFF;
-}
-
-.nav .open>a, .nav .open>a:focus, .nav .open>a:hover {
-    background-color:#C8102E;
-}
-
-.dropdown-menu {
-    padding:0;
-}
-
-.dropdown-menu>li>a {
-    padding:8px 20px;
-}
-
-.dropdown-menu .divider {
-    margin:0;
-}
-
-@media (max-width: 767px) {
-    .navbar-nav .open .dropdown-menu {
-        background-color:#FFF;
-    }
-
+@media (min-width: 768px) {
     .navbar-nav {
-        margin:0 -15px;
+        margin: 0px;
+    }
+    .navbar-right {
+        margin-right: -15px;
+    }
+}
+
+.navbar-nav a {
+    transition: background-color 0.3s, color 0.3s;
+}
+
+.navbar-nav > li > a {
+    color: #DDD;
+}
+
+.navbar-nav > li:hover > a,
+.navbar-nav > li > a:focus,
+.nav .open > a:hover,
+.nav .open > a:focus {
+    background-color: #C8102E;
+    color: #FFF;
+}
+
+.navbar-nav .dropdown .dropdown-menu {
+    padding: 0;
+    border: 0;
+    border-radius: 0;
+    background-color: #FFF;
+}
+
+.navbar-nav .dropdown .dropdown-menu > li > a {
+    padding: 8px 20px;
+    color: #333;
+}
+
+.navbar-nav .dropdown .dropdown-menu .divider {
+    margin: 0;
+}
+
+@media (min-width: 768px) {
+    .navbar-nav .dropdown .dropdown-menu {
+        display: block;
+        visibility: hidden;
+        opacity: 0;
+        transition: visibility 0s, opacity 0.3s;
+    }
+
+    .nav .dropdown:hover .dropdown-menu {
+        visibility: visible;
+        opacity: 1;
     }
 }
diff --git a/kfet/templates/kfet/account_create.html b/kfet/templates/kfet/account_create.html
index 3b4829d8..1278a54b 100644
--- a/kfet/templates/kfet/account_create.html
+++ b/kfet/templates/kfet/account_create.html
@@ -13,10 +13,10 @@
 
 {% include 'kfet/base_messages.html' %}
 
-<div class="row form-only">
-  <div class="col-sm-12 col-md-8 col-md-offset-2">
-    <div class="content-form">
-      <form action="{% url "kfet.account.create" %}" method="post" class="account_create">
+<div class="row">
+  <div class="col-sm-12 col-md-8 col-md-offset-2 nopadding">
+    <div class="content-center content-form">
+      <form action="" method="post" class="account_create">
         {% csrf_token %}
         <div>
           {{ trigramme_form.trigramme.errors }}
diff --git a/kfet/templates/kfet/account_create_special.html b/kfet/templates/kfet/account_create_special.html
index a002d40e..06f502d9 100644
--- a/kfet/templates/kfet/account_create_special.html
+++ b/kfet/templates/kfet/account_create_special.html
@@ -13,10 +13,10 @@
 
 {% include 'kfet/base_messages.html' %}
 
-<div class="row form-only">
-  <div class="col-sm-12 col-md-8 col-md-offset-2">
-    <div class="content-form">
-      <form action="{% url "kfet.account.create_special" %}" method="post" class="account_create">
+<div class="row">
+  <div class="col-sm-12 col-md-8 col-md-offset-2 nopadding">
+    <div class="content-center content-form">
+      <form action="" method="post" class="account_create">
         {% csrf_token %}
         <div>
           {{ trigramme_form.trigramme.errors }}
diff --git a/kfet/templates/kfet/account_update.html b/kfet/templates/kfet/account_update.html
index faacfe4b..b14147e6 100644
--- a/kfet/templates/kfet/account_update.html
+++ b/kfet/templates/kfet/account_update.html
@@ -1,6 +1,4 @@
 {% extends "kfet/base.html" %}
-{% load widget_tweaks %}
-{% load staticfiles %}
 
 {% block extra_head %}
 {{ negative_form.media }}
@@ -26,10 +24,10 @@
 
 {% include "kfet/base_messages.html" %}
 
-<div class="row form-only">
-  <div class="col-sm-12 col-md-8 col-md-offset-2">
-    <div class="content-form">
-      <form action="{% url 'kfet.account.update' account.trigramme %}" method="post" class="form-horizontal">
+<div class="row">
+  <div class="col-sm-12 col-md-8 col-md-offset-2 nopadding">
+    <div class="content-center content-form">
+      <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         {% include 'kfet/form_snippet.html' with form=user_form %}
         {% include 'kfet/form_snippet.html' with form=cof_form %}
diff --git a/kfet/templates/kfet/article_create.html b/kfet/templates/kfet/article_create.html
index 71672f8c..16f4de11 100644
--- a/kfet/templates/kfet/article_create.html
+++ b/kfet/templates/kfet/article_create.html
@@ -1,27 +1,10 @@
 {% extends 'kfet/base.html' %}
-{% load widget_tweaks %}
-{% load staticfiles %}
 
 {% block title %}Nouvel article{% endblock %}
 {% block content-header-title %}Création d'un article{% endblock %}
 
 {% block content %}
 
-{% include "kfet/base_messages.html" %}
-
-<div class="row form-only">
-  <div class="col-sm-12 col-md-8 col-md-offset-2">
-    <div class="content-form">
-      <form submit="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% include 'kfet/form_snippet.html' with form=form %}
-        {% if not perms.kfet.add_article %}
-          {% include 'kfet/form_authentication_snippet.html' %}
-        {% endif %}
-        {% include 'kfet/form_submit_snippet.html' with value="Enregistrer" %}
-      </form>
-    </div>
-  </div>
-</div>
+{% include "kfet/base_form.html" with authz=perms.kfet.add_article submit_text="Enregistrer" %}
 
 {% endblock %}
diff --git a/kfet/templates/kfet/article_update.html b/kfet/templates/kfet/article_update.html
index a3bfbcc6..65ccec3b 100644
--- a/kfet/templates/kfet/article_update.html
+++ b/kfet/templates/kfet/article_update.html
@@ -1,27 +1,10 @@
 {% extends 'kfet/base.html' %}
-{% load widget_tweaks %}
-{% load staticfiles %}
 
 {% block title %}Édition de l'article {{ article.name }}{% endblock %}
 {% block content-header-title %}Article {{ article.name }} - Édition{% endblock %}
 
 {% block content %}
 
-{% include "kfet/base_messages.html" %}
-
-<div class="row form-only">
-  <div class="col-sm-12 col-md-8 col-md-offset-2">
-    <div class="content-form">
-      <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% include 'kfet/form_snippet.html' with form=form %}
-        {% if not perms.kfet.change_article %}
-          {% include 'kfet/form_authentication_snippet.html' %}
-        {% endif %}
-        {% include 'kfet/form_submit_snippet.html' with value="Mettre à jour" %}
-      </form>
-    </div>
-  </div>
-</div>
+{% include "kfet/base_form.html" with authz=perms.kfet.change_article submit_text="Mettre à jour"%}
 
 {% endblock %}
diff --git a/kfet/templates/kfet/base_form.html b/kfet/templates/kfet/base_form.html
new file mode 100644
index 00000000..b83e888a
--- /dev/null
+++ b/kfet/templates/kfet/base_form.html
@@ -0,0 +1,16 @@
+{% include "kfet/base_messages.html" %}
+
+<div class="row">
+  <div class="col-sm-12 col-md-8 col-md-offset-2 nopadding">
+    <div class="content-center content-form">
+      <form submit="" method="post" class="form-horizontal">
+        {% csrf_token %}
+        {% include "kfet/form_snippet.html" %}
+        {% if not authz %}
+          {% include "kfet/form_authentication_snippet.html" %}
+        {% endif %}
+        {% include "kfet/form_submit_snippet.html" with value=submit_text %}
+      </form>
+    </div>
+  </div>
+</div>
diff --git a/kfet/templates/kfet/base_messages.html b/kfet/templates/kfet/base_messages.html
index 3ac8512d..66b67162 100644
--- a/kfet/templates/kfet/base_messages.html
+++ b/kfet/templates/kfet/base_messages.html
@@ -1,7 +1,7 @@
 {% if messages %}
 <div class="row messages">
   {% for message in messages %}
-    <div class="col-sm-12 item">
+    <div class="col-sm-12 nopadding">
       <div class="alert alert-{{ message.level_tag }} alert-dismissible fade in {{ message.tags }}">
         <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span></button>
         {% if 'safe' in message.tags %}
diff --git a/kfet/templates/kfet/base_nav.html b/kfet/templates/kfet/base_nav.html
index b5c98375..46003bb3 100644
--- a/kfet/templates/kfet/base_nav.html
+++ b/kfet/templates/kfet/base_nav.html
@@ -9,46 +9,50 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="#">
+      <a class="navbar-brand" href="{% url 'kfet.home' %}">
         <img src="{% static 'kfet/img/logo3.png' %}">
       </a>
     </div>
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">
-        <li><a href="{% url 'kfet.home' %}">Home</a></li>
+        <li>
+          <a href="{% url 'kfet.home' %}">
+            <span class="glyphicon glyphicon-home"></span>
+          </a>
+        </li>
+        {% if user.profile.account_kfet %}
+        <li>
+          <a href="{% url 'kfet.account.read' user.profile.account_kfet.trigramme %}">Mon compte</a>
+        </li>
+        {% endif %}
       </ul>
       <ul class="nav navbar-nav navbar-right">
         {% if user.username == 'kfet_genericteam' %}
-          <li class="navbar-text">Équipe standard</li>
-        {% endif %}
-        {% if user.profile.account_kfet %}
-          <li>
-            <a href="{% url 'kfet.account.read' user.profile.account_kfet.trigramme %}">Mes infos</a>
-          </li>
+        <li class="navbar-text">Équipe standard</li>
         {% endif %}
         {% if perms.kfet.is_team %}
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Admin <span class="caret"></span></a>
-            <ul class="dropdown-menu">
-              <li><a href="{% url 'kfet.kpsul' %}">K-Psul</a></li>
-              <li><a href="{% url 'kfet.history' %}">Historique</a></li>
-              <li><a href="{% url 'kfet.transfers' %}">Transferts</a></li>
-              <li class="divider"></li>
-              <li><a href="{% url 'kfet.account' %}">Comptes</a></li>
-              <li><a href="{% url 'kfet.checkout' %}">Caisses</a></li>
-              <li class="divider"></li>
-              <li><a href="{% url 'kfet.article' %}">Articles</a></li>
-              <li><a href="{% url 'kfet.inventory' %}">Inventaires</a></li>
-              <li><a href="{% url 'kfet.order' %}">Commandes</a></li>
-              {% if user.username != 'kfet_genericteam' %}
-                <li class="divider"></li>
-                <li><a href="{% url 'kfet.login.genericteam' %}" target="_blank" id="genericteam">Connexion standard</a></li>
-              {% endif %}
-              {% if perms.kfet.change_settings %}
-                <li><a href="{% url 'kfet.settings' %}">Paramètres</a></li>
-              {% endif %}
-            </ul>
-          </li>
+        <li><a href="{% url 'kfet.kpsul' %}">K-Psul</a></li>
+        <li><a href="{% url 'kfet.history' %}">Historique</a></li>
+        <li><a href="{% url 'kfet.transfers' %}">Transferts</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Admin <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li class="divider"></li>
+            <li><a href="{% url 'kfet.account' %}">Comptes</a></li>
+            <li><a href="{% url 'kfet.checkout' %}">Caisses</a></li>
+            <li class="divider"></li>
+            <li><a href="{% url 'kfet.article' %}">Articles</a></li>
+            <li><a href="{% url 'kfet.inventory' %}">Inventaires</a></li>
+            <li><a href="{% url 'kfet.order' %}">Commandes</a></li>
+            {% if user.username != 'kfet_genericteam' %}
+            <li class="divider"></li>
+            <li><a href="{% url 'kfet.login.genericteam' %}" target="_blank" id="genericteam">Connexion standard</a></li>
+            {% endif %}
+            {% if perms.kfet.change_settings %}
+            <li><a href="{% url 'kfet.settings' %}">Paramètres</a></li>
+            {% endif %}
+          </ul>
+        </li>
         {% endif %}
         {% if user.is_authenticated %}
         <li><a href="{% url 'gestioncof.views.logout' %}?next=/k-fet/" title="Déconnexion"><span class="glyphicon glyphicon-log-out"></span></a></li>
diff --git a/kfet/templates/kfet/category_update.html b/kfet/templates/kfet/category_update.html
index 1a26d001..af213e71 100644
--- a/kfet/templates/kfet/category_update.html
+++ b/kfet/templates/kfet/category_update.html
@@ -5,21 +5,6 @@
 
 {% block content %}
 
-{% include "kfet/base_messages.html" %}
-
-<div class="row form-only">
-  <div class="col-sm-12 col-md-8 col-md-offset-2">
-    <div class="content-form">
-      <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% include 'kfet/form_snippet.html' with form=form %}
-        {% if not perms.kfet.edit_articlecategory %}
-          {% include 'kfet/form_authentication_snippet.html' %}
-        {% endif %}
-        {% include 'kfet/form_submit_snippet.html' with value="Enregistrer"%}
-      <form>
-    </div>
-  </div>
-</div>
+{% include "kfet/base_form.html" with authz=perms.kfet.edit_articlecategory submit_text="Enregistrer"%}
 
 {% endblock %}
diff --git a/kfet/templates/kfet/checkoutstatement_update.html b/kfet/templates/kfet/checkoutstatement_update.html
index fd35b959..9935bd33 100644
--- a/kfet/templates/kfet/checkoutstatement_update.html
+++ b/kfet/templates/kfet/checkoutstatement_update.html
@@ -7,27 +7,6 @@ Caisse {{ checkout.name }} - Modification relevé {{ checkoutstatement.at }}
 
 {% block content %}
 
-<div class="row">
-  <div class="col-sm-4 col-md-3 col-content-left">
-    <div class="content-left">
-      {% include 'kfet/left_checkout.html' %}
-    </div>
-  </div>
-  <div class="col-sm-8 col-md-9 col-content-right">
-    {% include 'kfet/base_messages.html' %}
-    <div class="content-right form-only">
-      <div class="content-form">
-        <form submit="" method="post" class="form-horizontal">
-          {% csrf_token %}
-          {% include 'kfet/form_snippet.html' with form=form %}
-          {% if not perms.kfet.change_checkoutstatement %}
-            {% include 'kfet/form_authentication_snippet.html' %}
-          {% endif %}
-          {% include 'kfet/form_submit_snippet.html' with value="Enregistrer" %}
-        </form>
-      </div>
-    </div>
-  </div>
-</div>
+{% include "kfet/base_form.html" with authz=perms.kfet.change_checkoutstatement submit_text="Enregistrer"%}
 
 {% endblock %}
diff --git a/kfet/templates/kfet/home.html b/kfet/templates/kfet/home.html
index 687c8573..5e8eb6b5 100644
--- a/kfet/templates/kfet/home.html
+++ b/kfet/templates/kfet/home.html
@@ -3,24 +3,20 @@
 {% load kfet_tags %}
 
 {% block title %}Accueil{% endblock %}
-{% block content-header-title %}Accueil{% endblock %}
+{% block content-header %}{% endblock %}
 {% block extra_head %}
 <link rel="stylesheet" type="text/css" href="{% static 'kfet/css/home.css' %}">
 {% endblock %}
 
 {% block content %}
 
+{% include 'kfet/base_messages.html' %}
 <div class="row">
-  <div class="col-sm-4 col-md-3 col-content-left">
-    <div class="content-left">
-    </div>
-  </div>
-  <div class="col-sm-8 col-md-9 col-content-right">
-    {% include 'kfet/base_messages.html' %}
-    <div class="content-right">
+  <div class="col-sm-12 col-md-8 col-md-offset-2 nopadding">
+    <div class="content-center">
       <div class="content-right-block">
         <h2>Carte</h2>
-  <div class="column-row">
+        <div class="column-row">
           <div class="column-sm-1 column-md-2 column-lg-3">
             <div class="unbreakable carte-inverted">
               {% if pressions %}
diff --git a/kfet/templates/kfet/login_genericteam.html b/kfet/templates/kfet/login_genericteam.html
index f5f8c863..d2f8eca0 100644
--- a/kfet/templates/kfet/login_genericteam.html
+++ b/kfet/templates/kfet/login_genericteam.html
@@ -1,7 +1,7 @@
 {% extends 'kfet/base.html' %}
 
-{% block content %}
-
-Connexion utilisateur K-Fêt générique réussie
-
+{% block extra_head %}
+<script type="text/javascript">
+    close();
+</script>
 {% endblock %}
diff --git a/kfet/templates/kfet/settings_update.html b/kfet/templates/kfet/settings_update.html
index fdd5f5d4..b5f46c23 100644
--- a/kfet/templates/kfet/settings_update.html
+++ b/kfet/templates/kfet/settings_update.html
@@ -5,21 +5,6 @@
 
 {% block content %}
 
-{% include "kfet/base_messages.html" %}
-
-<div class="row form-only">
-  <div class="col-sm-12 col-md-8 col-md-offset-2">
-    <div class="content-form">
-      <form submit="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% include 'kfet/form_snippet.html' with form=form %}
-        {% if not perms.kfet.change_settings %}
-          {% include 'kfet/form_authentication_snippet.html' %}
-        {% endif %}
-        {% include 'kfet/form_submit_snippet.html' with value="Mettre à jour" %}
-      </form>
-    </div>
-  </div>
-</div>
+{% include "kfet/base_form.html" with authz=perms.kfet.change_settings submit_text="Mettre à jour"%}
 
 {% endblock %}
diff --git a/kfet/templates/kfet/supplier_form.html b/kfet/templates/kfet/supplier_form.html
index 168f74d9..434b9382 100644
--- a/kfet/templates/kfet/supplier_form.html
+++ b/kfet/templates/kfet/supplier_form.html
@@ -1,27 +1,10 @@
 {% extends 'kfet/base.html' %}
-{% load widget_tweaks %}
-{% load staticfiles %}
 
 {% block title %}Fournisseur - Modification{% endblock %}
 {% block content-header-title %}Fournisseur - Modification{% endblock %}
 
 {% block content %}
 
-{% include 'kfet/base_messages.html' %}
-
-<div class="row form-only">
-  <div class="col-sm-12 col-md-8 col-md-offset-2">
-    <div class="content-form">
-      <form submit="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% include 'kfet/form_snippet.html' with form=form %}
-        {% if not perms.kfet.change_supplier %}
-          {% include 'kfet/form_authentication_snippet.html' %}
-        {% endif %}
-        {% include 'kfet/form_submit_snippet.html' with value="Mettre à jour" %}
-      </form>
-    </div>
-  </div>
-</div>
+{% include 'kfet/base_form.html' with authz=perms.kfet.change_supplier submit_text="Mettre à jour" %}
 
 {% endblock %}
diff --git a/kfet/views.py b/kfet/views.py
index 60dbb44b..7b1674c4 100644
--- a/kfet/views.py
+++ b/kfet/views.py
@@ -85,6 +85,8 @@ def login_genericteam(request):
     user = authenticate(username="kfet_genericteam", token=token.token)
     login(request, user)
 
+    messages.success(request, "Connecté en utilisateur partagé")
+
     if need_cas_logout:
         # Vue de déconnexion de CAS
         return logout_cas
@@ -514,6 +516,10 @@ def account_update(request, trigramme):
 
     return render(request, "kfet/account_update.html", {
         'account': account,
+        'forms': [
+            user_form, cof_form, account_form, group_form, pwd_form,
+            negative_form,
+        ],
         'account_form': account_form,
         'cof_form': cof_form,
         'user_form': user_form,