diff --git a/shiftregister/app/templates/partials/shift_listitem.html b/shiftregister/app/templates/partials/shift_listitem.html
index 9a7564d..30d5d46 100644
--- a/shiftregister/app/templates/partials/shift_listitem.html
+++ b/shiftregister/app/templates/partials/shift_listitem.html
@@ -2,7 +2,8 @@
     <div class="box">
         <div class="content">
             <strong>Ort:</strong> {{ shift.room.name }}<br>
-            <strong>Beginn:</strong> {{ shift.start_at }}
+            <strong>Beginn:</strong> {{ shift.start_at }}<br>
+            <strong>Dauer:</strong> {{ shift.duration }}
         </div>
         <div class="is-flex is-justify-content-end">
 {% if registered %}
diff --git a/shiftregister/app/templates/shift.html b/shiftregister/app/templates/shift.html
index 3c4d7c1..a5ced05 100644
--- a/shiftregister/app/templates/shift.html
+++ b/shiftregister/app/templates/shift.html
@@ -1,30 +1,33 @@
 {% extends "helper_base.html" %}
 
 {% block title %}Schichtansicht{% endblock %}
+
 {% block content %}
 <div class="box">
 {% if is_registered %}
-<div>Du bist zu dieser Schicht angemeldet</div>
+    <div class="notification is-info">Du bist zu dieser Schicht angemeldet</div>
 {% endif %}
-Ort: {{ shift.room.name }}<br>
-Start: {{ shift.start_at }}<br>
-Dauer: {{ shift.duration }}<br>
+    <div class="content">
+        <strong>Ort:</strong> {{ shift.room.name }}<br>
+        <strong>Beginn:</strong> {{ shift.start_at }}<br>
+        <strong>Dauer:</strong> {{ shift.duration }}
+    </div>
 {% if can_register %}
-<form action="" method="post">
-    {% csrf_token %}
-    {{ shift_form.as_p }}
-    <input type="submit" class="button is-link" value="Anmelden">
-</form>
+    <form action="" method="post">
+        {% csrf_token %}
+        {{ shift_form.as_p }}
+        <input type="submit" class="button is-link" value="Anmelden">
+    </form>
 {% endif %}
 {% if is_registered %}
 {% if can_cancel %}
-<form action="{% url 'cancel' shift.pk %}" method="post">
-    {% csrf_token %}
-    {{ shift_form.as_p }}
-    <input type="submit" class="button is-danger is-small" value="Abmelden">
-</form>
+    <form action="{% url 'cancel' shift.pk %}" method="post">
+        {% csrf_token %}
+        {{ shift_form.as_p }}
+        <input type="submit" class="button is-danger is-small" value="Abmelden">
+    </form>
 {% elif not shift.has_ended %}
-Bitte wende dich an den Infopoint, falls du es nicht zu deiner Schicht schaffst.
+    <div class="content">Bitte wende dich an den Infopoint, falls du es nicht zu deiner Schicht schaffst.</div>
 {% endif %}
 {% endif %}
 </div>