diff --git a/machines/templates/machines/aff_alias.html b/machines/templates/machines/aff_alias.html
index 17266a6e..5a1bc8f8 100644
--- a/machines/templates/machines/aff_alias.html
+++ b/machines/templates/machines/aff_alias.html
@@ -28,21 +28,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Aliases" %}</th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Aliases" %}</th>
+        <th></th>
+    </tr>
     </thead>
     {% for alias in alias_list %}
         <tr>
             <td>{{ alias }}</td>
             <td class="text-right">
                 {% can_edit alias %}
-                {% include 'buttons/edit.html' with href='machines:edit-alias' id=alias.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-alias' id=alias.id %}
                 {% acl_end %}
                 {% history_button alias %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_dname.html b/machines/templates/machines/aff_dname.html
index 7e043d7c..66883057 100644
--- a/machines/templates/machines/aff_dname.html
+++ b/machines/templates/machines/aff_dname.html
@@ -26,11 +26,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Target zone" %}</th>
-            <th>{% trans "Record" %}</th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Target zone" %}</th>
+        <th>{% trans "Record" %}</th>
+        <th></th>
+    </tr>
     </thead>
     {% for dname in dname_list %}
         <tr>
@@ -38,11 +38,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ dname.dns_entry }}</td>
             <td class="text-right">
                 {% can_edit dname %}
-                {% include 'buttons/edit.html' with href='machines:edit-dname' id=dname.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-dname' id=dname.id %}
                 {% acl_end %}
                 {% history_button dname %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_extension.html b/machines/templates/machines/aff_extension.html
index 43bb9e39..b8493f5f 100644
--- a/machines/templates/machines/aff_extension.html
+++ b/machines/templates/machines/aff_extension.html
@@ -30,34 +30,33 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <div class="table-responsive">
     <table class="table table-striped">
         <thead>
-            <tr>
-                <th>{% trans "Extension" %}</th>
-                <th>{% trans "'infra' right required" %}</th>
-                <th>{% trans "SOA record" %}</th>
-                <th>{% trans "A record origin" %}</th>
-                {% if ipv6_enabled %}
+        <tr>
+            <th>{% trans "Extension" %}</th>
+            <th>{% trans "'infra' right required" %}</th>
+            <th>{% trans "SOA record" %}</th>
+            <th>{% trans "A record origin" %}</th>
+            {% if ipv6_enabled %}
                 <th>{% trans "AAAA record origin" %}</th>
-                {% endif %}
-                <th></th>
-            </tr>
+            {% endif %}
+            <th></th>
+        </tr>
         </thead>
         {% for extension in extension_list %}
-        <tr>
-            <td>{{ extension.name }}</td>
-            <td>{{ extension.need_infra|tick }}</td>
-            <td>{{ extension.soa }}</td>
-            <td>{{ extension.origin }}</td>
-            {% if ipv6_enabled %}
-            <td>{{ extension.origin_v6 }}</td>
-            {% endif %}
-            <td class="text-right">
-                {% can_edit extension %}
-                {% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %}
-                {% acl_end %}
-                {% history_button extension %}
-            </td>
-        </tr>
+            <tr>
+                <td>{{ extension.name }}</td>
+                <td>{{ extension.need_infra|tick }}</td>
+                <td>{{ extension.soa }}</td>
+                <td>{{ extension.origin }}</td>
+                {% if ipv6_enabled %}
+                    <td>{{ extension.origin_v6 }}</td>
+                {% endif %}
+                <td class="text-right">
+                    {% can_edit extension %}
+                        {% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %}
+                    {% acl_end %}
+                    {% history_button extension %}
+                </td>
+            </tr>
         {% endfor %}
     </table>
 </div>
-
diff --git a/machines/templates/machines/aff_iptype.html b/machines/templates/machines/aff_iptype.html
index b8ed5293..b408bfb1 100644
--- a/machines/templates/machines/aff_iptype.html
+++ b/machines/templates/machines/aff_iptype.html
@@ -31,36 +31,36 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <div class="table-responsive">
     <table class="table table-striped">
         <thead>
-            <tr>
-                <th>{% trans "IP type" %}</th>
-                <th>{% trans "Extension" %}</th>
-                <th>{% trans "'infra' right required" %}</th>
-                <th>{% trans "IPv4 range" %}</th>
-                <th>{% trans "v6 prefix" %}</th>
-                <th>{% trans "DNSSEC reverse v4/v6" %}</th>
-                <th>{% trans "On VLAN(s)" %}</th>
-                <th>{% trans "Default ports opening" %}</th>
-                <th></th>
-            </tr>
+        <tr>
+            <th>{% trans "IP type" %}</th>
+            <th>{% trans "Extension" %}</th>
+            <th>{% trans "'infra' right required" %}</th>
+            <th>{% trans "IPv4 range" %}</th>
+            <th>{% trans "v6 prefix" %}</th>
+            <th>{% trans "DNSSEC reverse v4/v6" %}</th>
+            <th>{% trans "On VLAN(s)" %}</th>
+            <th>{% trans "Default ports opening" %}</th>
+            <th></th>
+        </tr>
         </thead>
         {% for type in iptype_list %}
-        <tr>
-            <td>{{ type.type }}</td>
-            <td>{{ type.extension }}</td>
-            <td>{{ type.need_infra|tick }}</td>
-	    <td>{{ type.domaine_ip_start }}-{{ type.domaine_ip_stop }}{% if type.ip_network %}<b><u> on </b></u>{{ type.ip_network }}{% endif %}</td>
-            <td>{{ type.prefix_v6 }}/{{ type.prefix_v6_length }}</td>
-	    <td>{{ type.reverse_v4|tick }}/{{ type.reverse_v6|tick }}</td>
-            <td>{{ type.vlan }}</td>
-            <td>{{ type.ouverture_ports }}</td>
-            <td class="text-right">
-                {% can_edit type %}
-                {% include 'buttons/edit.html' with href='machines:edit-iptype' id=type.id %}
-                {% acl_end %}
-                {% history_button type %}
-            </td>
-        </tr>
+            <tr>
+                <td>{{ type.type }}</td>
+                <td>{{ type.extension }}</td>
+                <td>{{ type.need_infra|tick }}</td>
+                <td>{{ type.domaine_ip_start }}-{{ type.domaine_ip_stop }}{% if type.ip_network %}<b><u> on </u></b>
+                    {{ type.ip_network }}{% endif %}</td>
+                <td>{{ type.prefix_v6 }}/{{ type.prefix_v6_length }}</td>
+                <td>{{ type.reverse_v4|tick }}/{{ type.reverse_v6|tick }}</td>
+                <td>{{ type.vlan }}</td>
+                <td>{{ type.ouverture_ports }}</td>
+                <td class="text-right">
+                    {% can_edit type %}
+                        {% include 'buttons/edit.html' with href='machines:edit-iptype' id=type.id %}
+                    {% acl_end %}
+                    {% history_button type %}
+                </td>
+            </tr>
         {% endfor %}
     </table>
 </div>
-
diff --git a/machines/templates/machines/aff_ipv6.html b/machines/templates/machines/aff_ipv6.html
index a98c0327..e8e4a48e 100644
--- a/machines/templates/machines/aff_ipv6.html
+++ b/machines/templates/machines/aff_ipv6.html
@@ -28,26 +28,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "IPv6 addresses" %}</th>
-            <th>{% trans "SLAAC" %}</th>
-            <th></th>
-        </tr>
-        </thead>
+    <tr>
+        <th>{% trans "IPv6 addresses" %}</th>
+        <th>{% trans "SLAAC" %}</th>
+        <th></th>
+    </tr>
+    </thead>
     {% for ipv6 in ipv6_list %}
         <tr>
             <td>{{ ipv6.ipv6 }}</td>
             <td>{{ ipv6.slaac_ip }}</td>
             <td class="text-right">
                 {% can_edit ipv6 %}
-                {% include 'buttons/edit.html' with href='machines:edit-ipv6list' id=ipv6.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-ipv6list' id=ipv6.id %}
                 {% acl_end %}
                 {% can_delete ipv6 %}
-                {% include 'buttons/suppr.html' with href='machines:del-ipv6list' id=ipv6.id %}
+                    {% include 'buttons/suppr.html' with href='machines:del-ipv6list' id=ipv6.id %}
                 {% acl_end %}
                 {% history_button ipv6 %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html
index 76ba3451..bd65fc76 100644
--- a/machines/templates/machines/aff_machines.html
+++ b/machines/templates/machines/aff_machines.html
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <div class="table-responsive">
     {% if machines_list.paginator %}
-    {% include "pagination.html" with list=machines_list %}
+        {% include "pagination.html" with list=machines_list %}
     {% endif %}
 
     <table class="table" id="machines_table">
@@ -61,156 +61,160 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                         {% can_create Interface machine.id %}
                         {% trans "Create an interface" as tr_create_an_interface %}
                         {% include 'buttons/add.html' with href='machines:new-interface' id=machine.id desc=tr_create_an_interface %}
-                        {% acl_end %}
-                        {% history_button machine %}
-                        {% can_delete machine %}
+                    {% acl_end %}
+                    {% history_button machine %}
+                    {% can_delete machine %}
                         {% include 'buttons/suppr.html' with href='machines:del-machine' id=machine.id %}
-                        {% acl_end %}
-                    </td>
-                </tr>
-                {% for interface in machine.interface_set.all %}
+                    {% acl_end %}
+                </td>
+            </tr>
+            {% for interface in machine.interface_set.all %}
                 <tr>
                     <td>
                         {% if interface.domain.related_domain.all %}
-                        {{ interface.domain }}
-                        <button class="btn btn-default btn-xs" type="button" data-toggle="collapse" data-target="#collapseDomain_{{ interface.id }}" aria-expanded="true" aria-controls="collapseDomain_{{ interface.id }}">
-                            {% trans "Display the aliases" %}
-                        </button>
+                            {{ interface.domain }}
+                            <button class="btn btn-default btn-xs" type="button" data-toggle="collapse"
+                                    data-target="#collapseDomain_{{ interface.id }}" aria-expanded="true"
+                                    aria-controls="collapseDomain_{{ interface.id }}">
+                                {% trans "Display the aliases" %}
+                            </button>
                         {% else %}
-                        {{ interface.domain }}
+                            {{ interface.domain }}
                         {% endif %}
                     </td>
                     <td>
                         {{ interface.type }}
-		    </td>
+                    </td>
                     <td>
                         {{ interface.mac_address }}
                     </td>
                     <td>
                         <b>IPv4</b> {{ interface.ipv4 }}
                         <br>
-                        {% if ipv6_enabled and interface.ipv6 != 'None'%}
-                        <b>IPv6</b>
-                        <button class="btn btn-default btn-xs" type="button" data-toggle="collapse" data-target="#collapseIpv6_{{ interface.id }}" aria-expanded="true" aria-controls="collapseIpv6_{{ interface.id }}">
-                            {% trans "Display the IPv6 address" %}
-                        </button>
+                        {% if ipv6_enabled and interface.ipv6 != 'None' %}
+                            <b>IPv6</b>
+                            <button class="btn btn-default btn-xs" type="button" data-toggle="collapse"
+                                    data-target="#collapseIpv6_{{ interface.id }}" aria-expanded="true"
+                                    aria-controls="collapseIpv6_{{ interface.id }}">
+                                {% trans "Display the IPv6 address" %}
+                            </button>
                         {% endif %}
                     </td>
                     <td class="text-right">
                         <div style="width: 128px;">
                             <div class="btn-group" role="group">
-                                <button class="btn btn-primary btn-sm dropdown-toggle" type="button" id="editioninterface" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                <button class="btn btn-primary btn-sm dropdown-toggle" type="button"
+                                        id="editioninterface" data-toggle="dropdown" aria-haspopup="true"
+                                        aria-expanded="true">
                                     <i class="fa fa-edit"></i> <span class="caret"></span>
                                 </button>
                                 <ul class="dropdown-menu" aria-labelledby="editioninterface">
                                     {% can_edit interface %}
-                                    <li>
-                                        <a href="{% url 'machines:edit-interface' interface.id %}">
-                                            <i class="fa fa-edit"></i>
-                                            {% trans " Edit"%}
-                                        </a>
-                                    </li>
+                                        <li>
+                                            <a href="{% url 'machines:edit-interface' interface.id %}">
+                                                <i class="fa fa-edit"></i>
+                                                {% trans " Edit" %}
+                                            </a>
+                                        </li>
                                     {% acl_end %}
                                     {% can_create Domain interface.id %}
-                                    <li>
-                                        <a href="{% url 'machines:index-alias' interface.id %}">
-                                            <i class="fa fa-edit"></i>
-                                            {% trans " Manage the aliases" %}
-                                        </a>
-				    </li>
+                                        <li>
+                                            <a href="{% url 'machines:index-alias' interface.id %}">
+                                                <i class="fa fa-edit"></i>
+                                                {% trans " Manage the aliases" %}
+                                            </a>
+                                        </li>
                                     {% acl_end %}
                                     {% can_create Ipv6List interface.id %}
-                                    <li>
-                                        <a href="{% url 'machines:index-ipv6' interface.id %}">
-                                            <i class="fa fa-edit"></i>
-                                            {% trans " Manage the IPv6 addresses" %}
-                                        </a>
-                                    </li>
+                                        <li>
+                                            <a href="{% url 'machines:index-ipv6' interface.id %}">
+                                                <i class="fa fa-edit"></i>
+                                                {% trans " Manage the IPv6 addresses" %}
+                                            </a>
+                                        </li>
                                     {% acl_end %}
                                     {% can_create SshFp interface.machine.id %}
-                                    <li>
-                                        <a href="{% url 'machines:index-sshfp' interface.machine.id %}">
-                                            <i class="fa fa-edit"></i>
-                                            {% trans " Manage the SSH fingerprints" %}
-                                        </a>
-                                    </li>
+                                        <li>
+                                            <a href="{% url 'machines:index-sshfp' interface.machine.id %}">
+                                                <i class="fa fa-edit"></i>
+                                                {% trans " Manage the SSH fingerprints" %}
+                                            </a>
+                                        </li>
                                     {% acl_end %}
                                     {% can_create OuverturePortList %}
-                                    <li>
-                                        <a href="{% url 'machines:port-config' interface.id%}">
-                                            <i class="fa fa-edit"></i>
-                                            {% trans " Manage the ports configuration" %}
-                                        </a>
-                                    </li>
+                                        <li>
+                                            <a href="{% url 'machines:port-config' interface.id %}">
+                                                <i class="fa fa-edit"></i>
+                                                {% trans " Manage the ports configuration" %}
+                                            </a>
+                                        </li>
                                     {% acl_end %}
                                 </ul>
                             </div>
                             {% history_button interface %}
                             {% can_delete interface %}
-                            {% include 'buttons/suppr.html' with href='machines:del-interface' id=interface.id %}
+                                {% include 'buttons/suppr.html' with href='machines:del-interface' id=interface.id %}
                             {% acl_end %}
                         </div>
                     </td>
                 </tr>
-                {% if ipv6_enabled and interface.ipv6 != 'None'%}
-                <tr>
-                    <td colspan=5 style="border-top: none; padding: 1px;">
-                        <div class="collapse in" id="collapseIpv6_{{interface.id}}">
-                            <ul class="list-group" style="margin-bottom: 0px;">
-                            {% for ipv6 in interface.ipv6.all %}
-                                <li class="list-group-item col-xs-6 col-sm-6 col-md-6" style="border: none;">
-                                    {{ ipv6 }}
-                                </li>
-                            {% endfor %}
-                            </ul>
-                        </div>
-                    </td>
-                </tr>
+                {% if ipv6_enabled and interface.ipv6 != 'None' %}
+                    <tr>
+                        <td colspan=5 style="border-top: none; padding: 1px;">
+                            <div class="collapse in" id="collapseIpv6_{{ interface.id }}">
+                                <ul class="list-group" style="margin-bottom: 0;">
+                                    {% for ipv6 in interface.ipv6.all %}
+                                        <li class="list-group-item col-xs-6 col-sm-6 col-md-6" style="border: none;">
+                                            {{ ipv6 }}
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            </div>
+                        </td>
+                    </tr>
                 {% endif %}
                 {% if interface.domain.related_domain.all %}
-                <tr>
-                    <td colspan=5 style="border-top: none; padding: 1px;">
-                        <div class="collapse in" id="collapseDomain_{{interface.id}}">
-                            <ul class="list-group" style="margin-bottom: 0px;">
-                            {% for al in interface.domain.related_domain.all %}
-                                <li class="list-group-item col-xs-6 col-sm-4 col-md-3" style="border: none;">
-                                    <a href="http://{{ al }}">
-                                        {{ al }}
-                                        <i class="fa fa-share"></i>
-                                    </a>
-                                </li>
-                            {% endfor %}
-                            </ul>
-                        </div>
-                    </td>
-                </tr>
+                    <tr>
+                        <td colspan=5 style="border-top: none; padding: 1px;">
+                            <div class="collapse in" id="collapseDomain_{{ interface.id }}">
+                                <ul class="list-group" style="margin-bottom: 0;">
+                                    {% for al in interface.domain.related_domain.all %}
+                                        <li class="list-group-item col-xs-6 col-sm-4 col-md-3" style="border: none;">
+                                            <a href="http://{{ al }}">
+                                                {{ al }}
+                                                <i class="fa fa-share"></i>
+                                            </a>
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            </div>
+                        </td>
+                    </tr>
                 {% endif %}
-                {% endfor %}
-                <tr>
-                    <td colspan="8"></td>
-                </tr>
             {% endfor %}
-            </tbody>
-        </thead>
+            <tr>
+                <td colspan="8"></td>
+            </tr>
+        {% endfor %}
+        </tbody>
     </table>
 
     <script>
-$("#machines_table").ready( function() {
-    var alias_div = [{% for machine in machines_list %}{% for interface in machine.interface_set.all %}{% if interface.domain.related_domain.all %}$("#collapseDomain_{{ interface.id }}"), {% endif %}{% endfor %}{% endfor %}];
-    for (var i=0 ; i<alias_div.length ; i++) {
-        alias_div[i].collapse('hide');
-    }
-} );
-$("#machines_table").ready( function() {
-    var ipv6_div = [{% for machine in machines_list %}{% for interface in machine.interface_set.all %}{% if interface.ipv6.all %}$("#collapseIpv6_{{ interface.id }}"), {% endif %}{% endfor %}{% endfor %}];
-    for (var i=0 ; i<ipv6_div.length ; i++) {
-        ipv6_div[i].collapse('hide');
-    }
-} );
+        $("#machines_table").ready(function () {
+            var alias_div = [{% for machine in machines_list %}{% for interface in machine.interface_set.all %}{% if interface.domain.related_domain.all %}$("#collapseDomain_{{ interface.id }}"), {% endif %}{% endfor %}{% endfor %}];
+            for (var i = 0; i < alias_div.length; i++) {
+                alias_div[i].collapse('hide');
+            }
+        });
+        $("#machines_table").ready(function () {
+            var ipv6_div = [{% for machine in machines_list %}{% for interface in machine.interface_set.all %}{% if interface.ipv6.all %}$("#collapseIpv6_{{ interface.id }}"), {% endif %}{% endfor %}{% endfor %}];
+            for (var i = 0; i < ipv6_div.length; i++) {
+                ipv6_div[i].collapse('hide');
+            }
+        });
     </script>
 
     {% if machines_list.paginator %}
-    {% include "pagination.html" with list=machines_list %}
+        {% include "pagination.html" with list=machines_list %}
     {% endif %}
 </div>
-
diff --git a/machines/templates/machines/aff_machinetype.html b/machines/templates/machines/aff_machinetype.html
index 4725ffb8..a55a5370 100644
--- a/machines/templates/machines/aff_machinetype.html
+++ b/machines/templates/machines/aff_machinetype.html
@@ -28,11 +28,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Machine type" %}</th>
-            <th>{% trans "Matching IP type" %}</th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Machine type" %}</th>
+        <th>{% trans "Matching IP type" %}</th>
+        <th></th>
+    </tr>
     </thead>
     {% for type in machinetype_list %}
         <tr>
@@ -40,11 +40,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ type.ip_type }}</td>
             <td class="text-right">
                 {% can_edit type %}
-                {% include 'buttons/edit.html' with href='machines:edit-machinetype' id=type.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-machinetype' id=type.id %}
                 {% acl_end %}
                 {% history_button type %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_mx.html b/machines/templates/machines/aff_mx.html
index e57e73a4..4a50724b 100644
--- a/machines/templates/machines/aff_mx.html
+++ b/machines/templates/machines/aff_mx.html
@@ -28,12 +28,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Concerned zone" %}</th>
-            <th>{% trans "Priority" %}</th>
-            <th>{% trans "Record" %}</th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Concerned zone" %}</th>
+        <th>{% trans "Priority" %}</th>
+        <th>{% trans "Record" %}</th>
+        <th></th>
+    </tr>
     </thead>
     {% for mx in mx_list %}
         <tr>
@@ -42,11 +42,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ mx.name }}</td>
             <td class="text-right">
                 {% can_edit mx %}
-                {% include 'buttons/edit.html' with href='machines:edit-mx' id=mx.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-mx' id=mx.id %}
                 {% acl_end %}
                 {% history_button mx %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_nas.html b/machines/templates/machines/aff_nas.html
index 0dd612cc..84013f90 100644
--- a/machines/templates/machines/aff_nas.html
+++ b/machines/templates/machines/aff_nas.html
@@ -29,29 +29,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Name" %}</th>
-            <th>{% trans "NAS device type" %}</th>
-            <th>{% trans "Machine type linked to the NAS device" %}</th>
-            <th>{% trans "Access mode" %}</th>
-            <th>{% trans "MAC address auto capture" %}</th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Name" %}</th>
+        <th>{% trans "NAS device type" %}</th>
+        <th>{% trans "Machine type linked to the NAS device" %}</th>
+        <th>{% trans "Access mode" %}</th>
+        <th>{% trans "MAC address auto capture" %}</th>
+        <th></th>
+    </tr>
     </thead>
     {% for nas in nas_list %}
         <tr>
             <td>{{ nas.name }}</td>
-            <td>{{ nas.nas_type  }}</td>
+            <td>{{ nas.nas_type }}</td>
             <td>{{ nas.machine_type }}</td>
             <td>{{ nas.port_access_mode }}</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 %}
+                    {% include 'buttons/edit.html' with href='machines:edit-nas' id=nas.id %}
                 {% acl_end %}
                 {% history_button nas %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_ns.html b/machines/templates/machines/aff_ns.html
index e2187e3e..2968607a 100644
--- a/machines/templates/machines/aff_ns.html
+++ b/machines/templates/machines/aff_ns.html
@@ -28,11 +28,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Concerned zone" %}</th>
-            <th>{% trans "Authoritarian interface for the concerned zone" %}</th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Concerned zone" %}</th>
+        <th>{% trans "Authoritarian interface for the concerned zone" %}</th>
+        <th></th>
+    </tr>
     </thead>
     {% for ns in ns_list %}
         <tr>
@@ -40,11 +40,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ ns.ns }}</td>
             <td class="text-right">
                 {% can_edit ns %}
-                {% include 'buttons/edit.html' with href='machines:edit-ns' id=ns.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-ns' id=ns.id %}
                 {% acl_end %}
                 {% history_button ns %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_role.html b/machines/templates/machines/aff_role.html
index bba094b3..b6303917 100644
--- a/machines/templates/machines/aff_role.html
+++ b/machines/templates/machines/aff_role.html
@@ -29,13 +29,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Role name" %}</th>
-            <th>{% trans "Specific role" %}</th>
-            <th>{% trans "Servers" %}</th>
-            <th></th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Role name" %}</th>
+        <th>{% trans "Specific role" %}</th>
+        <th>{% trans "Servers" %}</th>
+        <th></th>
+        <th></th>
+    </tr>
     </thead>
     {% for role in role_list %}
         <tr>
@@ -43,12 +43,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ role.specific_role }}</td>
             <td>{% for serv in role.servers.all %}{{ serv }}, {% endfor %}</td>
             <td class="text-right">
-            {% can_edit role %}
-            {% include 'buttons/edit.html' with href='machines:edit-role' id=role.id %}
-            {% acl_end %}
-            {% history_button role %}
-        </td>
-    </tr>
+                {% can_edit role %}
+                    {% include 'buttons/edit.html' with href='machines:edit-role' id=role.id %}
+                {% acl_end %}
+                {% history_button role %}
+            </td>
+        </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_servers.html b/machines/templates/machines/aff_servers.html
index 7dd25495..4134c269 100644
--- a/machines/templates/machines/aff_servers.html
+++ b/machines/templates/machines/aff_servers.html
@@ -27,13 +27,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Service name" %}</th>
-            <th>{% trans "Server" %}</th>
-            <th>{% trans "Last regeneration" %}</th>
-            <th>{% trans "Regeneration required" %}</th>
-            <th>{% trans "Regeneration activated" %}</th>
-        </tr>
+    <tr>
+        <th>{% trans "Service name" %}</th>
+        <th>{% trans "Server" %}</th>
+        <th>{% trans "Last regeneration" %}</th>
+        <th>{% trans "Regeneration required" %}</th>
+        <th>{% trans "Regeneration activated" %}</th>
+    </tr>
     </thead>
     {% for server in servers_list %}
         <tr>
@@ -47,4 +47,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_service.html b/machines/templates/machines/aff_service.html
index df04b93c..102ceead 100644
--- a/machines/templates/machines/aff_service.html
+++ b/machines/templates/machines/aff_service.html
@@ -28,14 +28,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Service name" %}</th>
-            <th>{% trans "Minimal time before regeneration" %}</th>
-            <th>{% trans "Maximal time before regeneration" %}</th>
-            <th>{% trans "Included servers" %}</th>
-            <th>{% trans "Ask for regeneration" %}</th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Service name" %}</th>
+        <th>{% trans "Minimal time before regeneration" %}</th>
+        <th>{% trans "Maximal time before regeneration" %}</th>
+        <th>{% trans "Included servers" %}</th>
+        <th>{% trans "Ask for regeneration" %}</th>
+        <th></th>
+    </tr>
     </thead>
     {% for service in service_list %}
         <tr>
@@ -43,14 +43,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ service.min_time_regen }}</td>
             <td>{{ service.regular_time_regen }}</td>
             <td>{% for serv in service.servers.all %}{{ serv }}, {% endfor %}</td>
-            <td><a role="button" class="btn btn-danger" href="{% url 'machines:regen-service' service.id %}"><i class="fa fa-sync"></i></a></td>
+            <td><a role="button" class="btn btn-danger" href="{% url 'machines:regen-service' service.id %}"><i
+                    class="fa fa-sync"></i></a></td>
             <td class="text-right">
                 {% can_edit service %}
-                {% include 'buttons/edit.html' with href='machines:edit-service' id=service.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-service' id=service.id %}
                 {% acl_end %}
                 {% history_button service %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_soa.html b/machines/templates/machines/aff_soa.html
index fbf206e0..9199533e 100644
--- a/machines/templates/machines/aff_soa.html
+++ b/machines/templates/machines/aff_soa.html
@@ -28,15 +28,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Name" %}</th>
-            <th>{% trans "Mail" %}</th>
-            <th>{% trans "Refresh" %}</th>
-            <th>{% trans "Retry" %}</th>
-            <th>{% trans "Expire" %}</th>
-            <th>{% trans "TTL" %}</th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Name" %}</th>
+        <th>{% trans "Mail" %}</th>
+        <th>{% trans "Refresh" %}</th>
+        <th>{% trans "Retry" %}</th>
+        <th>{% trans "Expire" %}</th>
+        <th>{% trans "TTL" %}</th>
+        <th></th>
+    </tr>
     </thead>
     {% for soa in soa_list %}
         <tr>
@@ -48,11 +48,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ soa.ttl }}</td>
             <td class="text-right">
                 {% can_edit soa %}
-                {% include 'buttons/edit.html' with href='machines:edit-soa' id=soa.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-soa' id=soa.id %}
                 {% acl_end %}
                 {% history_button soa %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_srv.html b/machines/templates/machines/aff_srv.html
index 2ee569e0..71fb78a2 100644
--- a/machines/templates/machines/aff_srv.html
+++ b/machines/templates/machines/aff_srv.html
@@ -28,17 +28,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Service" %}</th>
-            <th>{% trans "Protocol" %}</th>
-            <th>{% trans "Extension" %}</th>
-            <th>{% trans "TTL" %}</th>
-            <th>{% trans "Priority" %}</th>
-            <th>{% trans "Weight" %}</th>
-            <th>{% trans "Port" %}</th>
-            <th>{% trans "Target" %}</th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Service" %}</th>
+        <th>{% trans "Protocol" %}</th>
+        <th>{% trans "Extension" %}</th>
+        <th>{% trans "TTL" %}</th>
+        <th>{% trans "Priority" %}</th>
+        <th>{% trans "Weight" %}</th>
+        <th>{% trans "Port" %}</th>
+        <th>{% trans "Target" %}</th>
+        <th></th>
+    </tr>
     </thead>
     {% for srv in srv_list %}
         <tr>
@@ -52,11 +52,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ srv.target }}</td>
             <td class="text-right">
                 {% can_edit srv %}
-                {% include 'buttons/edit.html' with href='machines:edit-srv' id=srv.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-srv' id=srv.id %}
                 {% acl_end %}
                 {% history_button srv %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_sshfp.html b/machines/templates/machines/aff_sshfp.html
index f684d6a0..08d1df13 100644
--- a/machines/templates/machines/aff_sshfp.html
+++ b/machines/templates/machines/aff_sshfp.html
@@ -27,12 +27,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <div class="table-responsive">
     <table class="table table-striped long_text">
         <thead>
-            <tr>
-                <th class="long_text">{% trans "SSH public key" %}</th>
-                <th>{% trans "Algorithm used" %}</th>
-                <th>{% trans "Comment" %}</th>
-                <th></th>
-            </tr>
+        <tr>
+            <th class="long_text">{% trans "SSH public key" %}</th>
+            <th>{% trans "Algorithm used" %}</th>
+            <th>{% trans "Comment" %}</th>
+            <th></th>
+        </tr>
         </thead>
         {% for sshfp in sshfp_list %}
             <tr>
@@ -41,15 +41,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <td>{{ sshfp.comment }}</td>
                 <td class="text-right">
                     {% can_edit sshfp %}
-                    {% include 'buttons/edit.html' with href='machines:edit-sshfp' id=sshfp.id %}
+                        {% include 'buttons/edit.html' with href='machines:edit-sshfp' id=sshfp.id %}
                     {% acl_end %}
                     {% history_button sshfp %}
                     {% can_delete sshfp %}
-                    {% include 'buttons/suppr.html' with href='machines:del-sshfp' id=sshfp.id %}
+                        {% include 'buttons/suppr.html' with href='machines:del-sshfp' id=sshfp.id %}
                     {% acl_end %}
                 </td>
             </tr>
         {% endfor %}
     </table>
 </div>
-
diff --git a/machines/templates/machines/aff_txt.html b/machines/templates/machines/aff_txt.html
index 41778cba..456f7343 100644
--- a/machines/templates/machines/aff_txt.html
+++ b/machines/templates/machines/aff_txt.html
@@ -28,11 +28,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
-        <tr>
-            <th>{% trans "Concerned zone" %}</th>
-            <th>{% trans "Record" %}</th>
-            <th></th>
-        </tr>
+    <tr>
+        <th>{% trans "Concerned zone" %}</th>
+        <th>{% trans "Record" %}</th>
+        <th></th>
+    </tr>
     </thead>
     {% for txt in txt_list %}
         <tr>
@@ -40,11 +40,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ txt.dns_entry }}</td>
             <td class="text-right">
                 {% can_edit txt %}
-                {% include 'buttons/edit.html' with href='machines:edit-txt' id=txt.id %}
+                    {% include 'buttons/edit.html' with href='machines:edit-txt' id=txt.id %}
                 {% acl_end %}
                 {% history_button txt %}
             </td>
         </tr>
     {% endfor %}
 </table>
-
diff --git a/machines/templates/machines/aff_vlan.html b/machines/templates/machines/aff_vlan.html
index 0c1ed053..3ccbfcb0 100644
--- a/machines/templates/machines/aff_vlan.html
+++ b/machines/templates/machines/aff_vlan.html
@@ -29,23 +29,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <div class="table-responsive">
     <table class="table table-striped">
         <thead>
-            <tr>
-                <th>{% trans "ID" %}</th>
-                <th>{% trans "Name" %}</th>
-                <th>{% trans "Comment" %}</th>
-                <th>{% trans "IP ranges" %}</th>
-                <th></th>
-            </tr>
+        <tr>
+            <th>{% trans "ID" %}</th>
+            <th>{% trans "Name" %}</th>
+            <th>{% trans "Comment" %}</th>
+            <th>{% trans "IP ranges" %}</th>
+            <th></th>
+        </tr>
         </thead>
         {% for vlan in vlan_list %}
             <tr>
                 <td>{{ vlan.vlan_id }}</td>
-                <td>{{ vlan.name  }}</td>
+                <td>{{ vlan.name }}</td>
                 <td>{{ vlan.comment }}</td>
-                <td>{% for range in vlan.iptype_set.all %}{{ range }}, {% endfor%}</td>
+                <td>{% for range in vlan.iptype_set.all %}{{ range }}, {% endfor %}</td>
                 <td class="text-right">
                     {% can_edit vlan %}
-                    {% include 'buttons/edit.html' with href='machines:edit-vlan' id=vlan.id %}
+                        {% include 'buttons/edit.html' with href='machines:edit-vlan' id=vlan.id %}
                     {% acl_end %}
                     {% history_button vlan %}
                 </td>
@@ -53,4 +53,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% endfor %}
     </table>
 </div>
-
diff --git a/machines/templates/machines/delete.html b/machines/templates/machines/delete.html
index ae365c69..f009f905 100644
--- a/machines/templates/machines/delete.html
+++ b/machines/templates/machines/delete.html
@@ -30,14 +30,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
 
-<form class="form" method="post">
-    {% csrf_token %}
-    <h4>{% blocktrans %}Warning: are you sure you want to delete this object {{ objet_name }} ( {{ objet }} )?{% endblocktrans %}</h4>
-    {% trans "Confirm" as tr_confirm %}
-    {% bootstrap_button tr_confirm button_type="submit" icon='trash' button_class='btn-danger' %}
-</form>
-  <br />
-  <br />
-  <br />
+    <form class="form" method="post">
+        {% csrf_token %}
+        <h4>{% blocktrans %}Warning: are you sure you want to delete this object {{ objet_name }} ( {{ objet }}
+            )?{% endblocktrans %}</h4>
+        {% trans "Confirm" as tr_confirm %}
+        {% bootstrap_button tr_confirm button_type="submit" icon='trash' button_class='btn-danger' %}
+    </form>
+    <br/>
+    <br/>
+    <br/>
 {% endblock %}
-
diff --git a/machines/templates/machines/edit_portlist.html b/machines/templates/machines/edit_portlist.html
index 5bb8723f..a7aa6f04 100644
--- a/machines/templates/machines/edit_portlist.html
+++ b/machines/templates/machines/edit_portlist.html
@@ -29,44 +29,45 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-{% bootstrap_form_errors port_list %}
+    {% bootstrap_form_errors port_list %}
 
 
-<form class="form" method="post">
-    {% csrf_token %}
-    {% bootstrap_form port_list %}
-    {{ ports.management_form }}
-    <div id="formset">
-    {% for form in ports.forms %}
-    	<div class="port">
-	    <p>
-	        {{ form }}
-	    </p>
-	</div>
-    {% endfor %}
-    </div>
+    <form class="form" method="post">
+        {% csrf_token %}
+        {% bootstrap_form port_list %}
+        {{ ports.management_form }}
+        <div id="formset">
+            {% for form in ports.forms %}
+                <div class="port">
+                    <p>
+                        {{ form }}
+                    </p>
+                </div>
+            {% endfor %}
+        </div>
 
-    <p>
-        {% trans "Add a port" as value %}
-        <input class="btn btn-primary btn-sm" role="button" value=value id="add_one">
-    </p>
-    {% trans "Create or edit" as tr_create_or_edit %}
-    {% bootstrap_button tr_create_or_edit icon='ok' button_class='btn-success' %}
-</form>
-<script type="text/javascript">
-    var template = `{{ports.empty_form}}`;
-    function add_port(){
-        var new_index = document.getElementsByClassName('port').length;
-	document.getElementById('id_form-TOTAL_FORMS').value =
-            parseInt(document.getElementById('id_form-TOTAL_FORMS').value) + 1;
-	var new_port = document.createElement('div');
-	new_port.className = 'port';
-	new_port.innerHTML = template.replace(/__prefix__/g, new_index);
-	document.getElementById('formset').appendChild(new_port);
-    }
-    document.addEventListener("DOMContentLoaded", function() {
-        document.getElementById("add_one").addEventListener("click", add_port, true);});
+        <p>
+            {% trans "Add a port" as value %}
+            <input class="btn btn-primary btn-sm" role="button" value="value" id="add_one">
+        </p>
+        {% trans "Create or edit" as tr_create_or_edit %}
+        {% bootstrap_button tr_create_or_edit icon='ok' button_class='btn-success' %}
+    </form>
+    <script type="text/javascript">
+        var template = `{{ports.empty_form}}`;
 
-</script>
+        function add_port() {
+            var new_index = document.getElementsByClassName('port').length;
+            document.getElementById('id_form-TOTAL_FORMS').value =
+                parseInt(document.getElementById('id_form-TOTAL_FORMS').value) + 1;
+            var new_port = document.createElement('div');
+            new_port.className = 'port';
+            new_port.innerHTML = template.replace(/__prefix__/g, new_index);
+            document.getElementById('formset').appendChild(new_port);
+        }
+
+        document.addEventListener("DOMContentLoaded", function () {
+            document.getElementById("add_one").addEventListener("click", add_port, true);
+        });
+    </script>
 {% endblock %}
-
diff --git a/machines/templates/machines/index.html b/machines/templates/machines/index.html
index 509334a0..ceef062c 100644
--- a/machines/templates/machines/index.html
+++ b/machines/templates/machines/index.html
@@ -29,10 +29,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-  <h2>{% trans "Machines" %}</h2>
-  {%  include "machines/aff_machines.html" with  machines_list=machines_list %}
-  <br />
-  <br />
-  <br />
+    <h2>{% trans "Machines" %}</h2>
+    {% include "machines/aff_machines.html" with  machines_list=machines_list %}
+    <br/>
+    <br/>
+    <br/>
 {% endblock %}
-
diff --git a/machines/templates/machines/index_alias.html b/machines/templates/machines/index_alias.html
index 2d33177f..a2ffe66b 100644
--- a/machines/templates/machines/index_alias.html
+++ b/machines/templates/machines/index_alias.html
@@ -30,11 +30,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
     <h2>{% trans "List of the aliases of the interface" %}</h2>
-    <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-alias' interface_id  %}"><i class="fa fa-plus"></i>{% trans " Add an alias" %}</a>
-    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-alias'  interface_id %}"><i class="fa fa-trash"></i>{% trans " Delete one or several aliases" %}</a>
-    {%  include "machines/aff_alias.html" with  alias_list=alias_list %}
-    <br />
-    <br />
-    <br />
+    <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-alias' interface_id %}"><i
+            class="fa fa-plus"></i>{% trans " Add an alias" %}</a>
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-alias'  interface_id %}"><i
+            class="fa fa-trash"></i>{% trans " Delete one or several aliases" %}</a>
+    {% include "machines/aff_alias.html" with  alias_list=alias_list %}
+    <br/>
+    <br/>
+    <br/>
 {% endblock %}
-
diff --git a/machines/templates/machines/index_extension.html b/machines/templates/machines/index_extension.html
index 6669d197..e689d479 100644
--- a/machines/templates/machines/index_extension.html
+++ b/machines/templates/machines/index_extension.html
@@ -24,67 +24,86 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endcomment %}
 
 {% load bootstrap3 %}
-
 {% load acl %}
 {% load i18n %}
 
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-<h2>{% trans "List of extensions" %}</h2>
-  {% can_create Extension %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-extension'  %}"><i class="fa fa-plus"></i>{% trans " Add an extension" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-extension'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several extensions" %}</a>
-  {%  include "machines/aff_extension.html" with  extension_list=extension_list %}
+    <h2>{% trans "List of extensions" %}</h2>
+    {% can_create Extension %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-extension' %}">
+            <i class="fa fa-plus"></i>
+            {% trans " Add an extension" %}</a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-extension' %}">
+        <i class="fa fa-trash"></i>{% trans " Delete one or several extensions" %}
+    </a>
+    {% include "machines/aff_extension.html" with  extension_list=extension_list %}
 
-  <h2>{% trans "List of SOA records" %}</h2>
-  {% can_create SOA %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-soa'  %}"><i class="fa fa-plus"></i>{% trans " Add an SOA record" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-soa'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several SOA records" %}</a>
-   {%  include "machines/aff_soa.html" with  soa_list=soa_list %}
+    <h2>{% trans "List of SOA records" %}</h2>
+    {% can_create SOA %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-soa' %}">
+            <i class="fa fa-plus"></i>{% trans " Add an SOA record" %}
+        </a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-soa' %}">
+        <i class="fa fa-trash"></i>{% trans " Delete one or several SOA records" %}
+    </a>
+    {% include "machines/aff_soa.html" with  soa_list=soa_list %}
 
-   <h2>{% trans "List of MX records" %}</h2>
-  {% can_create Mx %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-mx'  %}"><i class="fa fa-plus"></i>{% trans " Add an MX record" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-mx'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several MX records" %}</a>
-   {%  include "machines/aff_mx.html" with  mx_list=mx_list %}
+    <h2>{% trans "List of MX records" %}</h2>
+    {% can_create Mx %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-mx' %}">
+            <i class="fa fa-plus"></i>{% trans " Add an MX record" %}
+        </a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-mx' %}">
+        <i class="fa fa-trash"></i>{% trans " Delete one or several MX records" %}
+    </a>
+    {% include "machines/aff_mx.html" with  mx_list=mx_list %}
 
-   <h2>{% trans "List of NS records" %}</h2>
-  {% can_create Ns %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-ns'  %}"><i class="fa fa-plus"></i>{% trans " Add an NS record" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-ns'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several NS records" %}</a>
-   {%  include "machines/aff_ns.html" with  ns_list=ns_list %}
+    <h2>{% trans "List of NS records" %}</h2>
+    {% can_create Ns %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-ns' %}">
+            <i class="fa fa-plus"></i>{% trans " Add an NS record" %}
+        </a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-ns' %}">
+        <i class="fa fa-trash"></i>{% trans " Delete one or several NS records" %}
+    </a>
+    {% include "machines/aff_ns.html" with  ns_list=ns_list %}
 
-   <h2>{% trans "List of TXT records" %}</h2>
-  {% can_create Txt %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-txt'  %}"><i class="fa fa-plus"></i>{% trans " Add a TXT record" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-txt'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several TXT records" %}</a>
-   {%  include "machines/aff_txt.html" with  txt_list=txt_list %}
+    <h2>{% trans "List of TXT records" %}</h2>
+    {% can_create Txt %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-txt' %}">
+            <i class="fa fa-plus"></i>{% trans " Add a TXT record" %}
+        </a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-txt' %}">
+        <i class="fa fa-trash"></i>{% trans " Delete one or several TXT records" %}
+    </a>
+    {% include "machines/aff_txt.html" with  txt_list=txt_list %}
 
-   <h2>{% trans "List of DNAME records" %}</h2>
-  {% can_create DName %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-dname'  %}">
-      <i class="fa fa-plus"></i> {% trans " Add a DNAME record" %}
-  </a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-dname'  %}">
-      <i class="fa fa-trash"></i> {% trans " Delete one or several DNAME records" %}
-  </a>
-  {%  include "machines/aff_dname.html" with  dname_list=dname_list %}
-
-   <h2>{% trans "List of SRV records" %}</h2>
-  {% can_create Srv %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-srv'  %}"><i class="fa fa-plus"></i>{% trans " Add an SRV record" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-srv'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several SRV records" %}</a>
-   {%  include "machines/aff_srv.html" with  srv_list=srv_list %}
-   <br />
-  <br />
-  <br />
-  {% endblock %}
+    <h2>{% trans "List of DNAME records" %}</h2>
+    {% can_create DName %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-dname' %}">
+            <i class="fa fa-plus"></i> {% trans " Add a DNAME record" %}
+        </a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-dname' %}">
+        <i class="fa fa-trash"></i> {% trans " Delete one or several DNAME records" %}
+    </a>
+    {% include "machines/aff_dname.html" with  dname_list=dname_list %}
 
+    <h2>{% trans "List of SRV records" %}</h2>
+    {% can_create Srv %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-srv' %}">
+            <i class="fa fa-plus"></i>{% trans " Add an SRV record" %}
+        </a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-srv' %}">
+        <i class="fa fa-trash"></i>{% trans " Delete one or several SRV records" %}
+    </a>
+    {% include "machines/aff_srv.html" with  srv_list=srv_list %}
+{% endblock %}
diff --git a/machines/templates/machines/index_iptype.html b/machines/templates/machines/index_iptype.html
index 5be4561d..fea17993 100644
--- a/machines/templates/machines/index_iptype.html
+++ b/machines/templates/machines/index_iptype.html
@@ -24,21 +24,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endcomment %}
 
 {% load bootstrap3 %}
-
 {% load acl %}
 {% load i18n %}
 
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-<h2>{% trans "List of IP types" %}</h2>
-  {% can_create IpType %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-iptype'  %}"><i class="fa fa-plus"></i>{% trans " Add an IP type" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-iptype'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several IP types" %}</a>
-  {%  include "machines/aff_iptype.html" with  iptype_list=iptype_list %}
-  <br />
-  <br />
-  <br />
+    <h2>{% trans "List of IP types" %}</h2>
+    {% can_create IpType %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-iptype' %}">
+            <i class="fa fa-plus"></i>{% trans " Add an IP type" %}
+        </a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-iptype' %}">
+        <i class="fa fa-trash"></i>{% trans " Delete one or several IP types" %}
+    </a>
+    {% include "machines/aff_iptype.html" with  iptype_list=iptype_list %}
 {% endblock %}
-
diff --git a/machines/templates/machines/index_ipv6.html b/machines/templates/machines/index_ipv6.html
index 06e287e2..2ab2231e 100644
--- a/machines/templates/machines/index_ipv6.html
+++ b/machines/templates/machines/index_ipv6.html
@@ -30,13 +30,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-<h2>{% trans "List of the IPv6 addresses of the interface" %}</h2>
-  {% can_create Ipv6List interface_id %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-ipv6list' interface_id  %}"><i class="fa fa-plus"></i>{% trans " Add an IPv6 address" %}</a>
-  {% acl_end %}
-  {%  include "machines/aff_ipv6.html" with  ipv6_list=ipv6_list %}
-  <br />
-  <br />
-  <br />
+    <h2>{% trans "List of the IPv6 addresses of the interface" %}</h2>
+    {% can_create Ipv6List interface_id %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-ipv6list' interface_id %}">
+            <i class="fa fa-plus"></i>{% trans " Add an IPv6 address" %}
+        </a>
+    {% acl_end %}
+    {% include "machines/aff_ipv6.html" with  ipv6_list=ipv6_list %}
+    <br/>
+    <br/>
+    <br/>
 {% endblock %}
-
diff --git a/machines/templates/machines/index_machinetype.html b/machines/templates/machines/index_machinetype.html
index de1e2f58..5d184e29 100644
--- a/machines/templates/machines/index_machinetype.html
+++ b/machines/templates/machines/index_machinetype.html
@@ -31,14 +31,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-  <h2>{% trans "List of machine types" %}</h2>
-  {% can_create MachineType %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-machinetype'  %}"><i class="fa fa-plus"></i>{% trans " Add a machine type" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-machinetype'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several machine types" %}</a>
-  {%  include "machines/aff_machinetype.html" with  machinetype_list=machinetype_list %}
-  <br />
-  <br />
-  <br />
+    <h2>{% trans "List of machine types" %}</h2>
+    {% can_create MachineType %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-machinetype' %}">
+            <i class="fa fa-plus"></i>{% trans " Add a machine type" %}
+        </a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-machinetype' %}">
+        <i class="fa fa-trash"></i>{% trans " Delete one or several machine types" %}
+    </a>
+    {% include "machines/aff_machinetype.html" with  machinetype_list=machinetype_list %}
+    <br/>
+    <br/>
+    <br/>
 {% endblock %}
-
diff --git a/machines/templates/machines/index_nas.html b/machines/templates/machines/index_nas.html
index 88f68213..c4da9779 100644
--- a/machines/templates/machines/index_nas.html
+++ b/machines/templates/machines/index_nas.html
@@ -31,15 +31,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-  <h2>{% trans "List of NAS devices" %}</h2>
-  <h5>{% trans "The NAS device type and machine type are linked. It is useful for MAC address auto capture by RADIUS, and allows to choose the machine type to assign to the machines according to the NAS device type." %}</h5>
-  {% can_create Nas %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-nas' %}"><i class="fa fa-plus"></i>{% trans " Add a NAS device type" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-nas'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several NAS device types" %}</a>
-  {%  include "machines/aff_nas.html" with  nas_list=nas_list %}
-  <br />
-  <br />
-  <br />
+    <h2>{% trans "List of NAS devices" %}</h2>
+    <h5>{% trans "The NAS device type and machine type are linked. It is useful for MAC address auto capture by RADIUS, and allows to choose the machine type to assign to the machines according to the NAS device type." %}</h5>
+    {% can_create Nas %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-nas' %}">
+            <i class="fa fa-plus"></i>{% trans " Add a NAS device type" %}
+        </a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-nas' %}">
+        <i class="fa fa-trash"></i>{% trans " Delete one or several NAS device types" %}
+    </a>
+    {% include "machines/aff_nas.html" with  nas_list=nas_list %}
+    <br/>
+    <br/>
+    <br/>
 {% endblock %}
-
diff --git a/machines/templates/machines/index_portlist.html b/machines/templates/machines/index_portlist.html
index 0d3d0741..c6659b65 100644
--- a/machines/templates/machines/index_portlist.html
+++ b/machines/templates/machines/index_portlist.html
@@ -8,60 +8,58 @@
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-<h2>{% trans "List of ports configurations" %}</h2>
-  {% can_create OuverturePortList %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-portlist' %}"><i class="fa fa-plus"></i>{% trans " Add a configuration" %}</a>
-  {% acl_end %}
-  <table class="table table-striped">
-    <thead>
-      <tr>
-	<th>{% trans "Name" %}</th>
-	<th>{% trans "TCP (input)" %}</th>
-	<th>{% trans "TCP (output)" %}</th>
-	<th>{% trans "UDP (input)" %}</th>
-	<th>{% trans "UDP (output)" %}</th>
-	<th>{% trans "Machines" %}</th>
-	<th></th>
-      </tr>
-    </thead>
-    {% for pl in port_list %}
-    <tr>
-      <td>{{pl.name}}</td>
-      <td>{% for p in pl.tcp_ports_in %}{{p.show_port}}, {%endfor%}</td>
-      <td>{% for p in pl.tcp_ports_out %}{{p.show_port}}, {%endfor%}</td>
-      <td>{% for p in pl.udp_ports_in %}{{p.show_port}}, {%endfor%}</td>
-      <td>{% for p in pl.udp_ports_out %}{{p.show_port}}, {%endfor%}</td>
-      <td>
-      {% if pl.interface_set.all %}
-	<div class="dropdown">
-	    <button class="btn btn-default dropdown-toggle" type="button" id="editioninterface" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                	 <span class="caret"></span>
-	    </button>
-	    <ul class="dropdown-menu" aria-labelledby="editioninterface">
-	    {% for interface in pl.interface_set.all %}
-		<li>
-                   <a href="{% url 'users:profil' userid=interface.machine.user.id %}">
-			{{ interface }}
-		   </a>
-		</li>
-	    {% endfor %}
-	    </ul>
-	</div>
-      {% endif %}
-	<td class="text-right">
-	  {% can_edit pl %}
-	  {% include 'buttons/edit.html' with href='machines:edit-portlist' id=pl.id %}
-	  {% acl_end %}
-          {% can_delete pl %}
-	  {% include 'buttons/suppr.html' with href='machines:del-portlist' id=pl.id %}
-	  {% acl_end %}
-	</td>
-    </tr>
-    {%endfor%}
-  </table>
-  <br />
-  <br />
-  <br />
-
+    <h2>{% trans "List of ports configurations" %}</h2>
+    {% can_create OuverturePortList %}
+        <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-portlist' %}">
+            <i class="fa fa-plus"></i>{% trans " Add a configuration" %}
+        </a>
+    {% acl_end %}
+    <table class="table table-striped">
+        <thead>
+        <tr>
+            <th>{% trans "Name" %}</th>
+            <th>{% trans "TCP (input)" %}</th>
+            <th>{% trans "TCP (output)" %}</th>
+            <th>{% trans "UDP (input)" %}</th>
+            <th>{% trans "UDP (output)" %}</th>
+            <th>{% trans "Machines" %}</th>
+            <th></th>
+        </tr>
+        </thead>
+        {% for pl in port_list %}
+            <tr>
+                <td>{{ pl.name }}</td>
+                <td>{% for p in pl.tcp_ports_in %}{{ p.show_port }}, {% endfor %}</td>
+                <td>{% for p in pl.tcp_ports_out %}{{ p.show_port }}, {% endfor %}</td>
+                <td>{% for p in pl.udp_ports_in %}{{ p.show_port }}, {% endfor %}</td>
+                <td>{% for p in pl.udp_ports_out %}{{ p.show_port }}, {% endfor %}</td>
+                <td>
+                    {% if pl.interface_set.all %}
+                        <div class="dropdown">
+                            <button class="btn btn-default dropdown-toggle" type="button" id="editioninterface"
+                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu" aria-labelledby="editioninterface">
+                                {% for interface in pl.interface_set.all %}
+                                    <li>
+                                        <a href="{% url 'users:profil' userid=interface.machine.user.id %}">
+                                            {{ interface }}
+                                        </a>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        </div>
+                    {% endif %}
+                <td class="text-right">
+                    {% can_edit pl %}
+                    {% include 'buttons/edit.html' with href='machines:edit-portlist' id=pl.id %}
+                    {% acl_end %}
+                    {% can_delete pl %}
+                    {% include 'buttons/suppr.html' with href='machines:del-portlist' id=pl.id %}
+                    {% acl_end %}
+                </td>
+            </tr>
+        {% endfor %}
+    </table>
 {% endblock %}
-
diff --git a/machines/templates/machines/index_role.html b/machines/templates/machines/index_role.html
index ddc2ea8b..3271bc43 100644
--- a/machines/templates/machines/index_role.html
+++ b/machines/templates/machines/index_role.html
@@ -30,13 +30,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-<h2>{% trans "List of roles" %}</h2>
-  {% can_create Role %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-role'  %}"><i class="fa fa-plus"></i>{% trans " Add a role"%}</a>
-  {% acl_end %}
-    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-role'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several roles" %}</a>
-  {%  include "machines/aff_role.html" with  role_list=role_list %}
-  <br />
-  <br />
+    <h2>{% trans "List of roles" %}</h2>
+    {% can_create Role %}
+    <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-role' %}"><i
+            class="fa fa-plus"></i>{% trans " Add a role" %}</a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-role' %}"><i
+            class="fa fa-trash"></i>{% trans " Delete one or several roles" %}</a>
+    {% include "machines/aff_role.html" with  role_list=role_list %}
 {% endblock %}
-
diff --git a/machines/templates/machines/index_service.html b/machines/templates/machines/index_service.html
index 9dec7032..a41c79c6 100644
--- a/machines/templates/machines/index_service.html
+++ b/machines/templates/machines/index_service.html
@@ -30,16 +30,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-<h2>{% trans "List of services" %}</h2>
-  {% can_create machines.Service %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-service'  %}"><i class="fa fa-plus"></i>{% trans " Add a service" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-service'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several services" %}</a>
-  {%  include "machines/aff_service.html" with  service_list=service_list %}
-  <h2>{% trans "States of servers" %}</h2>
-  {%  include "machines/aff_servers.html" with  servers_list=servers_list %}
-  <br />
-  <br />
-  <br />
-{% endblock %}
+    <h2>{% trans "List of services" %}</h2>
+    {% can_create machines.Service %}
+    <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-service' %}"><i
+            class="fa fa-plus"></i>{% trans " Add a service" %}</a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-service' %}"><i
+            class="fa fa-trash"></i>{% trans " Delete one or several services" %}</a>
+    {% include "machines/aff_service.html" with  service_list=service_list %}
 
+    <h2>{% trans "States of servers" %}</h2>
+    {% include "machines/aff_servers.html" with  servers_list=servers_list %}
+{% endblock %}
diff --git a/machines/templates/machines/index_sshfp.html b/machines/templates/machines/index_sshfp.html
index ce16d621..0233bac4 100644
--- a/machines/templates/machines/index_sshfp.html
+++ b/machines/templates/machines/index_sshfp.html
@@ -34,6 +34,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <i class="fa fa-plus"></i>{% trans " Add an SSH fingerprint" %}
     </a>
     {% acl_end %}
-    {%  include "machines/aff_sshfp.html" with sshfp_list=sshfp_list %}
+    {% include "machines/aff_sshfp.html" with sshfp_list=sshfp_list %}
 {% endblock %}
-
diff --git a/machines/templates/machines/index_vlan.html b/machines/templates/machines/index_vlan.html
index 7af31fd5..f34f3ebb 100644
--- a/machines/templates/machines/index_vlan.html
+++ b/machines/templates/machines/index_vlan.html
@@ -24,21 +24,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endcomment %}
 
 {% load bootstrap3 %}
-
 {% load acl %}
 {% load i18n %}
 
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-<h2>{% trans "List of VLANs" %}</h2>
-  {% can_create Vlan %}
-  <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-vlan' %}"><i class="fa fa-plus"></i>{% trans " Add a VLAN" %}</a>
-  {% acl_end %}
-  <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-vlan'  %}"><i class="fa fa-trash"></i>{% trans " Delete one or several VLANs" %}</a>
-  {%  include "machines/aff_vlan.html" with  vlan_list=vlan_list %}
-  <br />
-  <br />
-  <br />
+    <h2>{% trans "List of VLANs" %}</h2>
+    {% can_create Vlan %}
+    <a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:add-vlan' %}"><i
+            class="fa fa-plus"></i>{% trans " Add a VLAN" %}</a>
+    {% acl_end %}
+    <a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-vlan' %}"><i
+            class="fa fa-trash"></i>{% trans " Delete one or several VLANs" %}</a>
+    {% include "machines/aff_vlan.html" with  vlan_list=vlan_list %}
 {% endblock %}
-
diff --git a/machines/templates/machines/machine.html b/machines/templates/machines/machine.html
index ed6529d0..1a8ce8b1 100644
--- a/machines/templates/machines/machine.html
+++ b/machines/templates/machines/machine.html
@@ -31,147 +31,143 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Machines" %}{% endblock %}
 
 {% block content %}
-{% if machineform %}
-    {% bootstrap_form_errors machineform %}
-{% endif %}
-{% if interfaceform %}
-    {% bootstrap_form_errors interfaceform %}
-{% endif %}
-{% if domainform %}
-    {% bootstrap_form_errors domainform %}
-{% endif %}
-{% if iptypeform %}
-    {% bootstrap_form_errors iptypeform %}
-{% endif %}
-{% if machinetypeform %}
-    {% bootstrap_form_errors machinetypeform %}
-{% endif %}
-{% if extensionform %}
-    {% bootstrap_form_errors extensionform %}
-{% endif %}
-{% if mxform %}
-    {% bootstrap_form_errors mxform %}
-{% endif %}
-{% if nsform %}
-    {% bootstrap_form_errors nsform %}
-{% endif %}
-{% if txtform %}
-    {% bootstrap_form_errors txtform %}
-{% endif %}
-{% if dnameform %}
-    {% bootstrap_form_errors dnameform %}
-{% endif %}
-{% if srvform %}
-    {% bootstrap_form_errors srvform %}
-{% endif %}
-{% if aliasform %}
-    {% bootstrap_form_errors aliasform %}
-{% endif %}
-{% if serviceform %}
-    {% bootstrap_form_errors serviceform %}
-{% endif %}
-{% if sshfpform %}
-    {% bootstrap_form_errors sshfpform %}
-{% endif %}
-{% if roleform %}
-    {% bootstrap_form_errors roleform %}
-{% endif %}
-{% if vlanform %}
-    {% bootstrap_form_errors vlanform %}
-{% endif %}
-{% if nasform %}
-    {% bootstrap_form_errors nasform %}
-{% endif %}
-{% if ipv6form %}
-    {% bootstrap_form_errors ipv6form %}
-{% endif %}
-
-<form class="form" method="post">
-    {% csrf_token %}
     {% if machineform %}
-    	<h3>{% trans "Machine" %}</h3>
-        {% massive_bootstrap_form machineform 'user' %}
+        {% bootstrap_form_errors machineform %}
     {% endif %}
     {% if interfaceform %}
-    	<h3>{% trans "Interface" %}</h3>
-        {% if i_mbf_param %}
-            {% massive_bootstrap_form interfaceform 'ipv4,machine' mbf_param=i_mbf_param %}
-        {% else %}
-            {% massive_bootstrap_form interfaceform 'ipv4,machine' %}
-        {% endif %}
+        {% bootstrap_form_errors interfaceform %}
     {% endif %}
     {% if domainform %}
-    	<h3>{% trans "Domain" %}</h3>
-        {% bootstrap_form domainform %}
+        {% bootstrap_form_errors domainform %}
     {% endif %}
     {% if iptypeform %}
-    	<h3>{% trans "IP type" %}</h3>
-        {% bootstrap_form iptypeform %}
+        {% bootstrap_form_errors iptypeform %}
     {% endif %}
     {% if machinetypeform %}
-    	<h3>{% trans "Machine type" %}</h3>
-        {% bootstrap_form machinetypeform %}
+        {% bootstrap_form_errors machinetypeform %}
     {% endif %}
     {% if extensionform %}
-    	<h3>{% trans "Extension" %}</h3>
-        {% massive_bootstrap_form extensionform 'origin' %}
-    {% endif %}
-    {% if soaform %}
-    	<h3>{% trans "SOA record" %}</h3>
-        {% bootstrap_form soaform %}
+        {% bootstrap_form_errors extensionform %}
     {% endif %}
     {% if mxform %}
-    	<h3>{% trans "MX record" %}</h3>
-        {% massive_bootstrap_form mxform 'name' %}
+        {% bootstrap_form_errors mxform %}
     {% endif %}
     {% if nsform %}
-    	<h3>{% trans "NS record" %}</h3>
-        {% massive_bootstrap_form nsform 'ns' %}
+        {% bootstrap_form_errors nsform %}
     {% endif %}
     {% if txtform %}
-    	<h3>{% trans "TXT record" %}</h3>
-        {% bootstrap_form txtform %}
+        {% bootstrap_form_errors txtform %}
     {% endif %}
     {% if dnameform %}
-        <h3>{% trans "DNAME record" %}</h3>
-        {% bootstrap_form dnameform %}
+        {% bootstrap_form_errors dnameform %}
     {% endif %}
     {% if srvform %}
-    	<h3>{% trans "SRV record" %}</h3>
-        {% massive_bootstrap_form srvform 'target'  %}
-    {% endif %}
-    {% if sshfpform %}
-        <h3>{% trans "SSHFP record" %}</h3>
-        {% bootstrap_form sshfpform %}
+        {% bootstrap_form_errors srvform %}
     {% endif %}
     {% if aliasform %}
-    	<h3>{% trans "Alias" %}</h3>
-        {% bootstrap_form aliasform %}
+        {% bootstrap_form_errors aliasform %}
     {% endif %}
     {% if serviceform %}
-    	<h3>{% trans "Service" %}</h3>
-        {% massive_bootstrap_form serviceform 'servers' %}
+        {% bootstrap_form_errors serviceform %}
+    {% endif %}
+    {% if sshfpform %}
+        {% bootstrap_form_errors sshfpform %}
     {% endif %}
     {% if roleform %}
-        <h3>Role</h3>
-        {% massive_bootstrap_form roleform 'servers' %}
+        {% bootstrap_form_errors roleform %}
     {% endif %}
     {% if vlanform %}
-    	<h3>{% trans "VLAN" %}</h3>
-        {% bootstrap_form vlanform %}
+        {% bootstrap_form_errors vlanform %}
     {% endif %}
     {% if nasform %}
-    	<h3>{% trans "NAS device" %}</h3>
-        {% bootstrap_form nasform %}
+        {% bootstrap_form_errors nasform %}
     {% endif %}
     {% if ipv6form %}
-    	<h3>{% trans "IPv6 address" %}</h3>
-        {% bootstrap_form ipv6form %}
+        {% bootstrap_form_errors ipv6form %}
     {% endif %}
-    {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %}
-</form>
-  <br />
-  <br />
-  <br />
-{% endblock %}
 
+    <form class="form" method="post">
+        {% csrf_token %}
+        {% if machineform %}
+            <h3>{% trans "Machine" %}</h3>
+            {% massive_bootstrap_form machineform 'user' %}
+        {% endif %}
+        {% if interfaceform %}
+            <h3>{% trans "Interface" %}</h3>
+            {% if i_mbf_param %}
+                {% massive_bootstrap_form interfaceform 'ipv4,machine' mbf_param=i_mbf_param %}
+            {% else %}
+                {% massive_bootstrap_form interfaceform 'ipv4,machine' %}
+            {% endif %}
+        {% endif %}
+        {% if domainform %}
+            <h3>{% trans "Domain" %}</h3>
+            {% bootstrap_form domainform %}
+        {% endif %}
+        {% if iptypeform %}
+            <h3>{% trans "IP type" %}</h3>
+            {% bootstrap_form iptypeform %}
+        {% endif %}
+        {% if machinetypeform %}
+            <h3>{% trans "Machine type" %}</h3>
+            {% bootstrap_form machinetypeform %}
+        {% endif %}
+        {% if extensionform %}
+            <h3>{% trans "Extension" %}</h3>
+            {% massive_bootstrap_form extensionform 'origin' %}
+        {% endif %}
+        {% if soaform %}
+            <h3>{% trans "SOA record" %}</h3>
+            {% bootstrap_form soaform %}
+        {% endif %}
+        {% if mxform %}
+            <h3>{% trans "MX record" %}</h3>
+            {% massive_bootstrap_form mxform 'name' %}
+        {% endif %}
+        {% if nsform %}
+            <h3>{% trans "NS record" %}</h3>
+            {% massive_bootstrap_form nsform 'ns' %}
+        {% endif %}
+        {% if txtform %}
+            <h3>{% trans "TXT record" %}</h3>
+            {% bootstrap_form txtform %}
+        {% endif %}
+        {% if dnameform %}
+            <h3>{% trans "DNAME record" %}</h3>
+            {% bootstrap_form dnameform %}
+        {% endif %}
+        {% if srvform %}
+            <h3>{% trans "SRV record" %}</h3>
+            {% massive_bootstrap_form srvform 'target' %}
+        {% endif %}
+        {% if sshfpform %}
+            <h3>{% trans "SSHFP record" %}</h3>
+            {% bootstrap_form sshfpform %}
+        {% endif %}
+        {% if aliasform %}
+            <h3>{% trans "Alias" %}</h3>
+            {% bootstrap_form aliasform %}
+        {% endif %}
+        {% if serviceform %}
+            <h3>{% trans "Service" %}</h3>
+            {% massive_bootstrap_form serviceform 'servers' %}
+        {% endif %}
+        {% if roleform %}
+            <h3>Role</h3>
+            {% massive_bootstrap_form roleform 'servers' %}
+        {% endif %}
+        {% if vlanform %}
+            <h3>{% trans "VLAN" %}</h3>
+            {% bootstrap_form vlanform %}
+        {% endif %}
+        {% if nasform %}
+            <h3>{% trans "NAS device" %}</h3>
+            {% bootstrap_form nasform %}
+        {% endif %}
+        {% if ipv6form %}
+            <h3>{% trans "IPv6 address" %}</h3>
+            {% bootstrap_form ipv6form %}
+        {% endif %}
+        {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %}
+    </form>
+{% endblock %}
diff --git a/machines/templates/machines/sidebar.html b/machines/templates/machines/sidebar.html
index 68e14ae0..81c83ab9 100644
--- a/machines/templates/machines/sidebar.html
+++ b/machines/templates/machines/sidebar.html
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% can_view_all Machine %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index" %}">
         <i class="fa fa-list-ul"></i>
-	{% trans "Machines" %}
+        {% trans "Machines" %}
     </a>
     {% acl_end %}
     {% can_view_all MachineType %}
@@ -42,31 +42,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% can_view_all Extension %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-extension" %}">
         <i class="fa fa-list-ul"></i>
-	{% trans "Extensions and zones" %}
+        {% trans "Extensions and zones" %}
     </a>
     {% acl_end %}
     {% can_view_all IpType %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-iptype" %}">
         <i class="fa fa-list-ul"></i>
-	{% trans "IP ranges" %}
+        {% trans "IP ranges" %}
     </a>
     {% acl_end %}
     {% can_view_all Vlan %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-vlan" %}">
         <i class="fa fa-list-ul"></i>
-	{% trans "VLANs" %}
+        {% trans "VLANs" %}
     </a>
     {% acl_end %}
     {% can_view_all Nas %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-nas" %}">
         <i class="fa fa-list-ul"></i>
-	{% trans "NAS devices" %}
+        {% trans "NAS devices" %}
     </a>
     {% acl_end %}
     {% can_view_all machines.Service %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-service" %}">
         <i class="fa fa-list-ul"></i>
-	{% trans "Services (DHCP, DNS, ...)" %}
+        {% trans "Services (DHCP, DNS, ...)" %}
     </a>
     {% acl_end %}
     {% can_view_all Role %}
@@ -78,8 +78,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% can_view_all OuverturePortList %}
     <a class="list-group-item list-group-item-info" href="{% url "machines:index-portlist" %}">
         <i class="fa fa-list-ul"></i>
-	{% trans "Ports openings" %}
+        {% trans "Ports openings" %}
     </a>
     {% acl_end %}
 {% endblock %}
-