diff --git a/topologie/templates/topologie/switch.html b/topologie/templates/topologie/switch.html
index 6af65bcd..6191b592 100644
--- a/topologie/templates/topologie/switch.html
+++ b/topologie/templates/topologie/switch.html
@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endcomment %}
 
 {% load bootstrap3 %}
-{% load massive_bootstrap_form %}
 {% load i18n %}
 
 {% block title %}{% trans "Topology" %}{% endblock %}
@@ -41,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
     {% if topoform %}
     <h3>{% trans "Specific settings for the switch" %}</h3>
-    {% massive_bootstrap_form topoform 'switch_interface' %}
+    {% bootstrap_form topoform  %}
     {% endif %}
     {% trans "Confirm" as tr_confirm %}
     {% bootstrap_button tr_confirm button_type="submit" icon='ok' button_class='btn-success' %}
diff --git a/topologie/templates/topologie/topo.html b/topologie/templates/topologie/topo.html
index 900a2b59..640f40a0 100644
--- a/topologie/templates/topologie/topo.html
+++ b/topologie/templates/topologie/topo.html
@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endcomment %}
 
 {% load bootstrap3 %}
-{% load massive_bootstrap_form %}
 {% load i18n %}
 
 {% block title %}{% trans "Topology" %}{% endblock %}
@@ -37,11 +36,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endif %}
 <form class="form" method="post">
     {% csrf_token %}
-    {% massive_bootstrap_form topoform 'room,related,machine_interface,members,vlan_tagged,switch' %}
+    {% bootstrap_form topoform  %}
     {% bootstrap_button action_name icon='ok' button_class='btn-success' %}
 </form>
   <br />
   <br />
   <br />
+
+{{ topoform.media }}
+
 {% endblock %}
 
diff --git a/topologie/templates/topologie/topo_more.html b/topologie/templates/topologie/topo_more.html
index 0180c72f..b0208568 100644
--- a/topologie/templates/topologie/topo_more.html
+++ b/topologie/templates/topologie/topo_more.html
@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% endcomment %}
 
 {% load bootstrap3 %}
-{% load massive_bootstrap_form %}
 {% load i18n %}
 
 {% block title %}{% trans "Topology" %}{% endblock %}
@@ -46,11 +45,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% csrf_token %}
     {% if topoform %}
     <h3>{% blocktrans %}Specific settings for the {{ device }} object{% endblocktrans %}</h3>
-    {% massive_bootstrap_form topoform 'ipv4,machine' mbf_param=i_mbf_param%}
+    {% bootstrap_form topoform %}
     {% endif %}
     {% if machineform %}
     <h3>{% blocktrans %}General settings for the machine linked to the {{ device }} object{% endblocktrans %}</h3>
-    {% massive_bootstrap_form machineform 'user' %}
+    {% bootstrap_form machineform %}
     {% endif %}
     {% if domainform %}
     <h3>{% trans "DNS name" %}</h3>