diff --git a/shiftregister/team/templates/shift_overview.html b/shiftregister/team/templates/shift_overview.html
index c822d96..86b8dac 100644
--- a/shiftregister/team/templates/shift_overview.html
+++ b/shiftregister/team/templates/shift_overview.html
@@ -10,8 +10,8 @@
     {% include "partials/shift_list_item.html" %}
 {% endfor %}
 </div>
-{% endif %}
 <hr>
+{% endif %}
 <h3 class="title is-spaced">Nächste Schichten pro Raum</h3>
 <div class="columns">
 {% for shift in next_shifts %}
diff --git a/shiftregister/team/views.py b/shiftregister/team/views.py
index be71835..085019c 100644
--- a/shiftregister/team/views.py
+++ b/shiftregister/team/views.py
@@ -17,7 +17,7 @@ def index(request):
 @login_required
 def shift_overview(request):
     context = {}
-    context["running_shifts"] = (
+    context["running_shifts"] = [
         shift
         for shift in Shift.objects.annotate(
             end_at=ExpressionWrapper(
@@ -27,15 +27,15 @@ def shift_overview(request):
         )
         .filter(start_at__lte=timezone.now(), end_at__gte=timezone.now())
         .order_by("start_at")
-    )
+    ]
 
     # probably can do some distinct/group by stuff but not sure how tih django queries
-    context["next_shifts"] = (
+    context["next_shifts"] = [
         Shift.objects.filter(room=room, start_at__gt=timezone.now())
         .order_by("start_at")
         .first()
         for room in Room.objects.all()
-    )
+    ]
 
     return render(request, "shift_overview.html", context)