diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/all_objects.html b/aleksis/apps/alsijil/templates/alsijil/class_register/all_objects.html
index 6a22b8a91fa322cc943fa8caedb3810e97906c80..b5e57e0ee276ab395ebd824327c7584a063dba63 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/all_objects.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/all_objects.html
@@ -14,46 +14,6 @@
 {% endblock %}
 
 {% block content %}
-  <div class="card">
-    <div class="card-content">
-      <div class="card-title">{% trans "Lesson filter" %}</div>
-      <form action="" method="get">
-        {% form form=filter_form %}{% endform %}
-        <button type="submit" class="btn waves-effect waves-light">
-          <i class="material-icons left">refresh</i>
-          {% trans "Update filters" %}
-        </button>
-      </form>
-    </div>
-  </div>
-
-  {% if table %}
-    <div class="card">
-      <div class="card-content">
-        <form action="" method="post">
-          {% csrf_token %}
-          <div class="row">
-            <div class="col s12 m4 l4 xl6">
-              <div class="card-title">{% trans "Lesson table" %}</div>
-            </div>
-            <div class="col s12 m8 l8 xl6">
-              <div class="col s12 m8">
-                {% form form=action_form %}{% endform %}</div>
-              <div class="col s12 m4">
-
-                <button type="submit" class="btn waves-effect waves-primary">
-                  {% trans "Execute" %}
-                  <i class="material-icons right">send</i>
-                </button>
-              </div>
-            </div>
-          </div>
-          {% render_table table %}
-
-        </form>
-      </div>
-    </div>
-  {% endif %}
-
+  {% include "alsijil/partials/objects_table.html" %}
   <script src="{% static "js/multi_select.js" %}"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
index 5302e24890221a731940bbe7999675bbc92bf143..96729befb2851ba6194c29ce1b1280d04033d6bd 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
@@ -9,7 +9,7 @@
   {% has_perm "alsijil.view_my_students" user as has_students %}
   {% if has_students %}
     <a href="{% url "my_students" %}"
-    class="btn-flat primary-color-text waves-light waves-effect">
+       class="btn-flat primary-color-text waves-light waves-effect">
       <i class="material-icons left">chevron_left</i> {% trans "Back" %}
     </a>
   {% endif %}
@@ -34,16 +34,7 @@
   </div>
   {% if register_object_table %}
     <div class="col s12" id="lesson-documentations">
-      <h5>{% trans "Lesson filter" %}</h5>
-      <form action="" method="get">
-        {% form form=filter_form %}{% endform %}
-        <button type="submit" class="btn waves-effect waves-light">
-          <i class="material-icons left">refresh</i>
-          {% trans "Update filters" %}
-        </button>
-      </form>
-      <h5>{% trans "Lesson table" %}</h5>
-      {% render_table register_object_table %}
+      {% include "alsijil/partials/objects_table.html" with table=register_object_table filter_form=filter_form %}
     </div>
   {% endif %}
   <div class="col s12" id="personal-notes">
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html b/aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html
new file mode 100644
index 0000000000000000000000000000000000000000..f13e6043935b6fe5b1e91915158cc12d39a8f2e0
--- /dev/null
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/objects_table.html
@@ -0,0 +1,43 @@
+{% load i18n material_form django_tables2 %}
+<div class="card">
+  <div class="card-content">
+    <div class="card-title">{% trans "Lesson filter" %}</div>
+    <form action="" method="get">
+      {% form form=filter_form %}{% endform %}
+      <button type="submit" class="btn waves-effect waves-light">
+        <i class="material-icons left">refresh</i>
+        {% trans "Update filters" %}
+      </button>
+    </form>
+  </div>
+</div>
+
+{% if table %}
+  <div class="card">
+    <div class="card-content">
+      <form action="" method="post">
+        {% csrf_token %}
+        <div class="row">
+          <div class="col s12 {% if action_form %}m4 l4 xl6{% endif %}">
+            <div class="card-title">{% trans "Lesson table" %}</div>
+          </div>
+          {% if action_form %}
+            <div class="col s12 m8 l8 xl6">
+              <div class="col s12 m8">
+                {% form form=action_form %}{% endform %}
+              </div>
+              <div class="col s12 m4">
+                <button type="submit" class="btn waves-effect waves-primary">
+                  {% trans "Execute" %}
+                  <i class="material-icons right">send</i>
+                </button>
+              </div>
+            </div>
+          {% endif %}
+        </div>
+        {% render_table table %}
+
+      </form>
+    </div>
+  </div>
+{% endif %}