diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
index b2914f2bf5f841875d7d6a413af75d4d7a8d4866..71277476a293ec3b798c19866291e3326177b9d2 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
@@ -50,15 +50,25 @@
   </div>
 
   <form method="post">
+    <p>{% include "core/partials/save_button.html" %}</p>
+    {% csrf_token %}
+
     <div class="row">
       <div class="col s12">
-        {% include "core/partials/save_button.html" %}
+        <ul class="tabs">
+          <li class="tab">
+            <a href="#lesson-documentation">{% trans "Lesson documentation" %}</a>
+          </li>
+          <li class="tab">
+            <a href="#personal-notes">{% trans "Personal notes" %}</a>
+          </li>
+          <li class="tab">
+            <a href="#version-history">{% trans "Change history" %}</a>
+          </li>
+        </ul>
       </div>
-    </div>
-    {% csrf_token %}
 
-    <div class="row">
-      <div class="col s12 m12 l6 xl8">
+      <div class="col s12" id="lesson-documentation">
         {% with prev_lesson=lesson_period.prev prev_doc=prev_lesson.get_lesson_documentation %}
           {% with prev_doc=prev_lesson.get_lesson_documentation absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses %}
             {% if prev_doc %}
@@ -123,20 +133,8 @@
           </div>
         </div>
       </div>
-      <div class="col s12 m12 l6 xl4">
-        <div class="card">
-          <div class="card-content">
-          <span class="card-title">
-            {% blocktrans %}Change history{% endblocktrans %}
-          </span>
-            {% include 'core/partials/crud_events.html' with obj=lesson_documentation %}
-          </div>
-        </div>
-      </div>
-    </div>
 
-    <div class="row">
-      <div class="col s12">
+      <div class="col s12" id="personal-notes">
         <div class="card">
           <div class="card-content">
       <span class="card-title">
@@ -203,12 +201,18 @@
           </div>
         </div>
       </div>
-    </div>
-
-    <div class="row">
-      <div class="col s12">
-        {% include "core/partials/save_button.html" %}
+      <div class="col s12" id="version-history">
+        <div class="card">
+          <div class="card-content">
+          <span class="card-title">
+            {% blocktrans %}Change history{% endblocktrans %}
+          </span>
+            {% include 'core/partials/crud_events.html' with obj=lesson_documentation %}
+          </div>
+        </div>
       </div>
     </div>
+
+    <p>{% include "core/partials/save_button.html" %}</p>
   </form>
 {% endblock %}