diff --git a/cotisations/templates/cotisations/aff_article.html b/cotisations/templates/cotisations/aff_article.html
index 3ed4568c..bf2aa104 100644
--- a/cotisations/templates/cotisations/aff_article.html
+++ b/cotisations/templates/cotisations/aff_article.html
@@ -25,20 +25,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% load acl %}
 {% load i18n %}
 {% load logs_extra %}
+{% load design %}
 
-    <table class="table table-striped">
-        <thead>
-            <tr>
-                <th>{% trans "Article" %}</th>
-                <th>{% trans "Price" %}</th>
-                <th>{% trans "Cotisation type" %}</th>
-                <th>{% trans "Duration (month)" %}</th>
-                <th>{% trans "Concerned users" %}</th>
-                <th>{% trans "Available for everyone" %}</th>
-                <th></th>
-            </tr>
-        </thead>
-        {% for article in article_list %}
+<table class="table table-striped">
+    <thead>
         <tr>
             <td>{{ article.name }}</td>
             <td>{{ article.prix }}</td>
@@ -54,7 +44,34 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% acl_end %}
                 {% history_button article %}
             </td>
+            <th>{% trans "Article" %}</th>
+            <th>{% trans "Price" %}</th>
+            <th>{% trans "Cotisation type" %}</th>
+            <th>{% trans "Duration (month)" %}</th>
+            <th>{% trans "Concerned users" %}</th>
+            <th>{% trans "Available for everyone" %}</th>
+            <th></th>
         </tr>
-        {% endfor %}
-    </table>
+    </thead>
+    {% for article in article_list %}
+    <tr>
+        <td>{{ article.name }}</td>
+        <td>{{ article.prix }}</td>
+        <td>{{ article.type_cotisation }}</td>
+        <td>{{ article.duration }}</td>
+        <td>{{ article.type_user }}</td>
+        <td>{{ article.available_for_everyone|tick }}</td>
+        <td class="text-right">
+            {% can_edit article %}
+            <a class="btn btn-primary btn-sm" role="button" title="{% trans "Edit" %}" href="{% url 'cotisations:edit-article' article.id %}">
+                <i class="fa fa-edit"></i>
+            </a>
+            {% acl_end %}
+            <a class="btn btn-info btn-sm" role="button" title="{% trans "Historique" %}" href="{% url 'cotisations:history' 'article' article.id %}">
+                <i class="fa fa-history"></i>
+            </a>
+        </td>
+    </tr>
+    {% endfor %}
+</table>
 
diff --git a/cotisations/templates/cotisations/aff_paiement.html b/cotisations/templates/cotisations/aff_paiement.html
index c07b7e3b..f85be9bb 100644
--- a/cotisations/templates/cotisations/aff_paiement.html
+++ b/cotisations/templates/cotisations/aff_paiement.html
@@ -25,17 +25,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% load acl %}
 {% load i18n %}
 {% load logs_extra %}
+{% load design %}
 
-    <table class="table table-striped">
-        <thead>
-            <tr>
-                <th>{% trans "Payment type" %}</th>
-                <th>{% trans "Is available for everyone" %}</th>
-                <th>{% trans "Custom payment method" %}</th>
-                <th></th>
-            </tr>
-        </thead>
-        {% for paiement in paiement_list %}
+<table class="table table-striped">
+    <thead>
         <tr>
             <td>{{ paiement.moyen }}</td>
             <td>{{ paiement.available_for_everyone }}</td>
@@ -50,7 +43,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% acl_end %}
                 {% history_button paiement %}
             </td>
+            <th>{% trans "Payment type" %}</th>
+            <th>{% trans "Is available for everyone" %}</th>
+            <th>{% trans "Custom payment method" %}</th>
+            <th></th>
         </tr>
-        {% endfor %}
-    </table>
+    </thead>
+    {% for paiement in paiement_list %}
+    <tr>
+        <td>{{ paiement.moyen }}</td>
+        <td>{{ paiement.available_for_everyone|tick }}</td>
+        <td>
+            {{paiement.get_payment_method_name}}
+        </td>
+        <td class="text-right">
+            {% can_edit paiement %}
+            <a class="btn btn-primary btn-sm" role="button" title="{% trans "Edit" %}" href="{% url 'cotisations:edit-paiement' paiement.id %}">
+                <i class="fa fa-edit"></i>
+            </a>
+            {% acl_end %}
+            <a class="btn btn-info btn-sm" role="button" title="{% trans "Historique" %}" href="{% url 'cotisations:history' 'paiement' paiement.id %}">
+                <i class="fa fa-history"></i>
+            </a>
+        </td>
+    </tr>
+    {% endfor %}
+</table>
 
diff --git a/machines/templates/machines/aff_extension.html b/machines/templates/machines/aff_extension.html
index 0692a039..94550604 100644
--- a/machines/templates/machines/aff_extension.html
+++ b/machines/templates/machines/aff_extension.html
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% load acl %}
 {% load logs_extra %}
+{% load design %}
 
 <div class="table-responsive">
     <table class="table table-striped">
@@ -42,7 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% for extension in extension_list %}
         <tr>
             <td>{{ extension.name }}</td>
-            <td>{{ extension.need_infra }}</td>
+            <td>{{ extension.need_infra|tick }}</td>
             <td>{{ extension.soa}}</td>
             <td>{{ extension.origin }}</td>
             {% if ipv6_enabled %}
@@ -53,6 +54,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %}
                 {% acl_end %}
                 {% history_button extension %}
+                {% include 'buttons/history.html' with href='machines:history' name='extension' id=extension.id %}
             </td>
         </tr>
         {% endfor %}
diff --git a/machines/templates/machines/aff_iptype.html b/machines/templates/machines/aff_iptype.html
index acf8260c..d0bff234 100644
--- a/machines/templates/machines/aff_iptype.html
+++ b/machines/templates/machines/aff_iptype.html
@@ -22,6 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 {% endcomment %}
 
+{% load design %}
+
 {% load acl %}
 {% load logs_extra %}
 <div class="table-responsive">
@@ -43,7 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             <td>{{ type.type }}</td>
             <td>{{ type.extension }}</td>
-            <td>{{ type.need_infra }}</td>
+            <td>{{ type.need_infra|tick }}</td>
             <td>{{ type.domaine_ip_start }}-{{ type.domaine_ip_stop }}</td>
             <td>{{ type.prefix_v6 }}</td>
             <td>{{ type.vlan }}</td>
@@ -53,6 +55,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% include 'buttons/edit.html' with href='machines:edit-iptype' id=type.id %}
                 {% acl_end %}
                 {% history_button type %}
+                {% include 'buttons/history.html' with href='machines:history' name='iptype' id=type.id %}
             </td>
         </tr>
         {% endfor %}
diff --git a/machines/templates/machines/aff_nas.html b/machines/templates/machines/aff_nas.html
index 2c2cfd21..86e75c7d 100644
--- a/machines/templates/machines/aff_nas.html
+++ b/machines/templates/machines/aff_nas.html
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% load acl %}
 {% load logs_extra %}
+{% load design %}
 
 <table class="table table-striped">
     <thead>
@@ -42,12 +43,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <td>{{ nas.nas_type  }}</td>
         <td>{{ nas.machine_type }}</td>
         <td>{{ nas.port_access_mode }}</td>
-        <td>{{ nas.autocapture_mac }}</td>
+        <td>{{ nas.autocapture_mac|tick }}</td>
         <td class="text-right">
             {% can_edit nas %}
             {% include 'buttons/edit.html' with href='machines:edit-nas' id=nas.id %}
             {% acl_end %}
             {% history_button nas %}
+            {% include 'buttons/history.html' with href='machines:history' name='nas' id=nas.id %}
         </td>
     </tr>
     {% endfor %}
diff --git a/machines/templates/machines/aff_servers.html b/machines/templates/machines/aff_servers.html
index 030afcea..90629e04 100644
--- a/machines/templates/machines/aff_servers.html
+++ b/machines/templates/machines/aff_servers.html
@@ -22,6 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 {% endcomment %}
 
+{% load design %}
+
 <table class="table table-striped">
     <thead>
         <tr>
@@ -37,8 +39,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <td>{{ server.service }}</td>
         <td>{{ server.server }}</td>
         <td>{{ server.last_regen }}</td>
-        <td>{{ server.asked_regen }}</td>
-        <td>{{ server.need_regen }}</td>
+        <td>{{ server.asked_regen| tick }}</td>
+        <td>{{ server.need_regen | tick }}</td>
         <td class="text-right">
         </td>
     </tr>
diff --git a/machines/templates/machines/aff_service.html b/machines/templates/machines/aff_service.html
index 6ca6278b..95705858 100644
--- a/machines/templates/machines/aff_service.html
+++ b/machines/templates/machines/aff_service.html
@@ -47,6 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% include 'buttons/edit.html' with href='machines:edit-service' id=service.id %}
             {% acl_end %}
             {% history_button service %}
+            {% include 'buttons/history.html' with href='machines:history' name='service' id=service.id %}
         </td>
     </tr>
     {% endfor %}
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 10fd947f..34417695 100755
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}Création et modification des préférences{% endblock %}
 
 {% block content %}
-<h4>Préférences utilisateur</h4> 
+<h4>Préférences utilisateur</h4>
 <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:edit-options' 'OptionalUser' %}">
         <i class="fa fa-edit"></i>
         Editer
@@ -56,12 +56,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <th>Creations de clubs par tous</th>
                 <td>{{ useroptions.all_can_create_club|tick }}</td>
         </tr>
-        <tr>
-                <th>Auto inscription</th>
-                <td>{{ useroptions.self_adhesion }}</td>
-                <th>Shell par défaut des utilisateurs</th>
-                <td>{{ useroptions.shell_default }}</td>
-        </tr>
 </table>
 
 
@@ -75,7 +69,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <table class="table table-striped">
         <tr>
                 <th>Mot de passe par machine</th>
-                <td>{{ machineoptions.password_machine }}</td>
+                <td>{{ machineoptions.password_machine|tick }}</td>
                 <th>Machines/interfaces autorisées par utilisateurs</th>
                 <td>{{ machineoptions.max_lambdauser_interfaces }}</td>
         </tr>
@@ -87,7 +81,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </tr>
         <tr>
                 <th>Creation de machines</th>
-                <td>{{ machineoptions.create_machine }}</td>
+                <td>{{ machineoptions.create_machine|tick }}</td>
         </tr>
 </table>
 <h4>Préférences topologie</h4>