diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
index af413a55d1caca91bab0c82157d0003f5e5920f4..798797354f17a2729f6e5eb14378a2fafe985eed 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
@@ -117,17 +117,27 @@
                   {% for period in periods %}
                     <a class="collection-item avatar"
                        href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
-                      <p class="title">
-                        {% include "alsijil/partials/lesson_status_icon.html" with period=period css_class="circle" color_suffix=" " %}
-                        {{ period.period.period }}. {{ period.get_subject.name }}
-                      </p>
-                      <p>
+                      {% include "alsijil/partials/lesson_status_icon.html" with period=period css_class="circle" color_suffix=" " %}
+                      <table class="hide-on-med-and-down">
+                        <tr>
+                          <th>{% trans "Subject" %}</th>
+                          <td>{{ period.period.period }}. {{ period.get_subject.name }}</td>
+                        </tr>
                         {% if not group %}
-                          {{ period.lesson.group_names }}
+                          <tr>
+                            <th>{% trans "Group" %}</th>
+                            <td>{{ period.lesson.group_names }}</td>
+                          </tr>
                         {% endif %}
-                        {{ period.get_teacher_names }}
-                      </p>
-                      <p>{{ period.get_lesson_documentation.topic }}</p>
+                        <tr>
+                          <th>{% trans "Teachers" %}</th>
+                          <td>{{ period.lesson.teacher_names }}</td>
+                        </tr>
+                        <tr>
+                          <th>{% trans "Lesson Topic" %}</th>
+                          <td>{{ period.get_lesson_documentation.topic }}</td>
+                        </tr>
+                      </table>
                     </a>
                   {% endfor %}
                 </div>