diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
index e73234c1fcfc7d830eb3955681649399577dc256..ef291777605938b8f2dbf4d62d6207faa4ddbfc7 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html
@@ -1,5 +1,6 @@
 {# -*- engine:django -*- #}
 {% extends "core/base.html" %}
+{% load data_helpers %}
 {% load week_helpers %}
 {% load i18n %}
 
@@ -21,8 +22,16 @@
       {% for note in unexcused_absences %}
         {% period_to_date note.week note.lesson_period.period as note_date %}
         <li class="collection-item">
+          <form action="" method="post" class="right" style="margin-top: -7px;">
+            {% csrf_token %}
+            {% trans "Mark as" %}
+            <input type="hidden" value="{{ note.pk }}" name="personal_note">
+            {% include "alsijil/partials/mark_as_buttons.html" %}
+          </form>
           <i class="material-icons left red-text">warning</i>
-          <p class="no-margin">{{ note_date }}, {{ note.lesson_period }}</p>
+          <p class="no-margin">
+            <a href="{% url "lesson_by_week_and_period" note.year note.week note.lesson_period.pk %}">{{ note_date }}, {{ note.lesson_period }}</a>
+          </p>
           {% if note.remarks %}
             <p class="no-margin"><em>{{ note.remarks }}</em></p>
           {% endif %}
@@ -62,14 +71,7 @@
                     {% csrf_token %}
                     {% trans "Mark all as" %}
                     <input type="hidden" value="{{ note_date|date:"Y-m-d" }}" name="date">
-                    <button type="submit" class="btn-flat" name="excuse_type" value="e">
-                      {% trans "e" %}
-                    </button>
-                    {% for excuse_type in excuse_types %}
-                      <button type="submit" class="btn-flat" value="{{ excuse_type.pk }}" name="excuse_type">
-                        {{ excuse_type.short_name }}
-                      </button>
-                    {% endfor %}
+                    {% include "alsijil/partials/mark_as_buttons.html" %}
                   </form>
                   <i class="material-icons left">schedule</i>
                   {{ note_date }}
@@ -86,24 +88,19 @@
 
                   <div class="col s12 m4">
                     <i class="material-icons left">event_note</i>
-                    {{ note.lesson_period.get_subject.name }},
-                    {{ note.lesson_period.get_teacher_names }}
+                    <a href="{% url "lesson_by_week_and_period" note.year note.week note.lesson_period.pk %}">
+                      {{ note.lesson_period.get_subject.name }}<br/>
+                      {{ note.lesson_period.get_teacher_names }}
+                    </a>
                   </div>
 
                   <div class="col s12 m7">
                     {% if note.absent and not note.excused %}
                       <form action="" method="post" class="right" style="margin-top: -7px;">
                         {% csrf_token %}
-                        {% trans "Mark all as" %}
+                        {% trans "Mark as" %}
                         <input type="hidden" value="{{ note.pk }}" name="personal_note">
-                        <button type="submit" class="btn-flat" name="excuse_type" value="e">
-                          {% trans "e" %}
-                        </button>
-                        {% for excuse_type in excuse_types %}
-                          <button type="submit" class="btn-flat" value="{{ excuse_type.pk }}" name="excuse_type">
-                            {{ excuse_type.short_name }}
-                          </button>
-                        {% endfor %}
+                        {% include "alsijil/partials/mark_as_buttons.html" %}
                       </form>
                     {% endif %}
 
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/mark_as_buttons.html b/aleksis/apps/alsijil/templates/alsijil/partials/mark_as_buttons.html
new file mode 100644
index 0000000000000000000000000000000000000000..0d84677fb881e17058f2f76452e096eec2472bd8
--- /dev/null
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/mark_as_buttons.html
@@ -0,0 +1,11 @@
+{% load i18n %}
+<button type="submit" class="btn-flat tooltipped" name="excuse_type" value="e" title="{% trans "Excused" %}"
+        data-position="bottom" data-tooltip="{% trans "Excused" %}">
+  {% trans "e" %}
+</button>
+{% for excuse_type in excuse_types %}
+  <button type="submit" class="btn-flat tooltipped" value="{{ excuse_type.pk }}" name="excuse_type"
+          title="{{ excuse_type.name }}" data-position="bottom" data-tooltip="{{ excuse_type.name }}">
+    {{ excuse_type.short_name }}
+  </button>
+{% endfor %}