diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
index 7092d63fca12c762273a1590427349efb7ffd216..184846783b16f8803fb2297e7c519c561230d46f 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
@@ -10,39 +10,40 @@
 {% endblock %}
 
 {% block content %}
-  {% if next_lesson_person or prev_lesson_person or lesson_documentation %}
-    <div class="row no-margin">
-      <div class="col s12 no-padding">
-        {# Back to week view #}
-        {% if back_to_week_url %}
-          <a href="{{ back_to_week_url }}"
-             class="btn primary-color waves-light waves-effect alsijil-top-button">
-            <i class="material-icons left">chevron_left</i> {% trans "Back to week view" %}
-          </a>
-        {% endif %}
-
-        {# Next lesson #}
-        {% if prev_lesson_person %}
-          <a class="btn primary waves-effect waves-light alsijil-top-button"
-             href="{% url "lesson_period" prev_lesson_person.week.year prev_lesson_person.week.week prev_lesson_person.id %}">
+  <h1>
+    {% if next_lesson_person or prev_lesson_person or lesson_documentation %}
+      <div class="row no-margin">
+        <div class="col s12 no-padding">
+          {# Back to week view #}
+          {% if back_to_week_url %}
+            <a href="{{ back_to_week_url }}"
+               class="btn primary-color waves-light waves-effect alsijil-top-button">
+              <i class="material-icons left">chevron_left</i> {% trans "Back to week view" %}
+            </a>
+          {% endif %}
+
+          {# Next lesson #}
+          {% if prev_lesson_person %}
+            <a class="btn primary waves-effect waves-light alsijil-top-button"
+               href="{% url " lesson_period" prev_lesson_person.week.year prev_lesson_person.week.week prev_lesson_person.id %}">
             <i class="material-icons left">arrow_back</i>
             {% trans "My previous lesson" %}
-          </a>
-        {% endif %}
+            </a>
+          {% endif %}
 
-        {# Previous lesson #}
-        {% if next_lesson_person %}
-          <a class="btn primary right waves-effect waves-light alsijil-top-button"
-             href="{% url "lesson_period" next_lesson_person.week.year next_lesson_person.week.week next_lesson_person.id %}">
+          {# Previous lesson #}
+          {% if next_lesson_person %}
+            <a class="btn primary right waves-effect waves-light alsijil-top-button"
+               href="{% url " lesson_period" next_lesson_person.week.year next_lesson_person.week.week next_lesson_person.id %}">
             <i class="material-icons right">arrow_forward</i>
             {% trans "My next lesson" %}
-          </a>
-        {% endif %}
+            </a>
+          {% endif %}
+        </div>
       </div>
-    </div>
-  {% endif %}
+    {% endif %}
+
 
-  <h4>
     {% if register_object.label_ == "event" %}
       {{ register_object.date_start }} {{ register_object.period_from.period }}.–{{ register_object.date_end }}
       {{ register_object.period_to.period }}.,
@@ -63,7 +64,7 @@
     <span class="right">
       {% include "alsijil/partials/lesson_status_icon.html" with register_object=register_object css_class="medium" %}
     </span>
-  </h4>
+  </h1>
   <br/>
 
   {% has_perm "alsijil.view_lessondocumentation_rule" user register_object as can_view_lesson_documentation %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
index a7eae4401d5737db8089c120f49d1455c3a07bf2..c97dd69bab4a2fd7788f612ac2b07932723c3184 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
@@ -62,7 +62,7 @@
   <!-- Personal Note Tab -->
   <div class="col s12" id="personal-notes">
     <div class="col s12" id="overview">
-      <h5>{% trans "Relevant personal notes" %}</h5>
+      <h2>{% trans "Relevant personal notes" %}</h2>
       <form class="modal" id="filter-modal">
         <figure class="modal-content">
           <figcaption>{% trans "Filter personal notes" %}</figcaption>
@@ -116,7 +116,7 @@
   <!-- Statistics Tab -->
   {% if stats %}
     <div class="col s12" id="statistics">
-      <h5>{% trans "Statistics on absences, tardiness and remarks" %}</h5>
+      <h2>{% trans "Statistics on absences, tardiness and remarks" %}</h2>
       <ul class="collapsible">
         {% for school_term, stat in stats %}
           <li {% if forloop.first %}class="active"{% endif %}>
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/persons.html b/aleksis/apps/alsijil/templates/alsijil/class_register/persons.html
index 84461c1830f81c411607f914c5102339dc62c709..f2c8394912a6f9bd7ddd15d734870168e08b0ee1 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/persons.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/persons.html
@@ -32,9 +32,9 @@
               </a>
             </span>
 
-            <h6>{{ group.name }}
+            <h2>{{ group.name }}
               <span class="chip">{{ group.school_term }}</span>
-            </h6>
+            </h2>
 
             <p class="show-on-active hide-on-med-and-up">
               <a class="btn primary-color waves-effect waves-light hundred-percent"