diff --git a/smash/web/templates/equipment_and_rooms/flying_teams/index.html b/smash/web/templates/equipment_and_rooms/flying_teams/index.html
index 4a55f8953d80f6144bb0112cebbebee8f1412882..df8165b16339e330b96565d457ae17b17b241672 100644
--- a/smash/web/templates/equipment_and_rooms/flying_teams/index.html
+++ b/smash/web/templates/equipment_and_rooms/flying_teams/index.html
@@ -50,3 +50,23 @@
         <p>No flying teams found.</p>
     {% endif %}
 {% endblock maincontent %}
+
+{% block scripts %}
+    {{ block.super }}
+
+    <script src="{% static 'AdminLTE/plugins/datatables/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.min.js' %}"></script>
+
+    <script>
+        $(function () {
+            $('#table').DataTable({
+                "paging": true,
+                "lengthChange": false,
+                "searching": true,
+                "ordering": true,
+                "info": true,
+                "autoWidth": false
+            });
+        });
+    </script>
+{% endblock scripts %}
diff --git a/smash/web/templates/equipment_and_rooms/rooms/add.html b/smash/web/templates/equipment_and_rooms/rooms/add.html
index 36cc0a78dd4d08ec7f8ba07a1469075dae5e845e..bd8406ec4e5410bda8da120ea543924eff943097 100644
--- a/smash/web/templates/equipment_and_rooms/rooms/add.html
+++ b/smash/web/templates/equipment_and_rooms/rooms/add.html
@@ -26,7 +26,7 @@
                     <div class="col-sm-6">
                         {% for field in form %}
                             <div class="form-group  {% if field.errors %}has-error{% endif %}">
-                                <label for="{# TODO #}" class="col-sm-4 control-label">
+                                <label for="{{ field.id_for_label }}" class="col-sm-4 control-label">
                                     {{ field.label }}
                                 </label>
 
diff --git a/smash/web/templates/equipment_and_rooms/rooms/index.html b/smash/web/templates/equipment_and_rooms/rooms/index.html
index 454cd79ed545d547da67be8295c9483c27075946..c5d34b728335f9d22e64f83474116d62ab101022 100644
--- a/smash/web/templates/equipment_and_rooms/rooms/index.html
+++ b/smash/web/templates/equipment_and_rooms/rooms/index.html
@@ -59,3 +59,23 @@
         <p>No rooms found.</p>
     {% endif %}
 {% endblock maincontent %}
+
+{% block scripts %}
+    {{ block.super }}
+
+    <script src="{% static 'AdminLTE/plugins/datatables/jquery.dataTables.min.js' %}"></script>
+    <script src="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.min.js' %}"></script>
+
+    <script>
+        $(function () {
+            $('#table').DataTable({
+                "paging": true,
+                "lengthChange": false,
+                "searching": true,
+                "ordering": true,
+                "info": true,
+                "autoWidth": false
+            });
+        });
+    </script>
+{% endblock scripts %}