diff --git a/shiftregister/team/templates/checkin_list.html b/shiftregister/team/templates/checkin_list.html
index 4931852..4435351 100644
--- a/shiftregister/team/templates/checkin_list.html
+++ b/shiftregister/team/templates/checkin_list.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load shift_extras %}
 
 {% block title %}{{ title }}{% endblock %}
 
@@ -10,15 +11,28 @@
             <th>Name</th>
             <th>Schicht</th>
             <th>Startzeit</th>
+            <th>Dauer</th>
             <th>Aktionen</th>
         </tr>
     </thead>
     <tbody>
 {% for reg in object_list %}
         <tr>
-            <td>{{ reg.helper.name }} ({{ reg.helper.phone|stringformat:"s"|slice:"-3:" }})</td>
-            <td>{{ reg.shift.room }}</td>
+            <td>
+                <a href="{% url 'team:helper' reg.helper.pk %}">
+                    {{ reg.helper.name }} ({{ reg.helper.phone|stringformat:"s"|slice:"-3:" }})
+                    {% if not reg.helper.asta_confirmed %}
+                        <span class="tag is-danger">AStA</span>
+                    {% endif %}
+                </a>
+            </td>
+            <td>
+                <span class="{{ reg.shift.event.calendar.needs_fallback|yesno:"is-underlined," }}">
+                    <a href="{% url 'team:shift_room' reg.shift.room.pk %}">{{ reg.shift.room }}</a>
+                </span>
+            </td>
 	    <td><a href="{% url 'team:shift' reg.shift.pk %}">{{ reg.shift.start_at }}</a></td>
+	    <td><a href="{% url 'team:shift' reg.shift.pk %}">{{ reg.shift.duration|duration }}</a></td>
             <td>
                 <a class="button is-success is-small" href="{% url 'team:checkin' reg.pk %}">Als angekommen markieren</a>
                 <a class="button is-danger is-small" href="{% url 'team:mark_as_failed' reg.pk %}">Nicht angetreten</a>
diff --git a/shiftregister/team/templates/partials/shift_box.html b/shiftregister/team/templates/partials/shift_box.html
index 189461b..d525c4f 100644
--- a/shiftregister/team/templates/partials/shift_box.html
+++ b/shiftregister/team/templates/partials/shift_box.html
@@ -3,7 +3,7 @@
 {% if shift.deleted %}
         <em>gelöscht</em><br>
 {% endif %}
-        <strong>Ort:</strong> {{ shift.room.name }}<br>
+        <strong>Ort:</strong> <span class="{{ shift.event.calendar.needs_fallback|yesno:"is-underlined," }}">{{ shift.room.name }}</span><br>
         <strong>Beginn:</strong> {{ shift.start_at }}<br>
         <strong>Dauer:</strong> {{ shift.duration }}<br>
         <strong>Belegung:</strong> {{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }}