diff --git a/app/aviary/templates/aviary/aviary_all.html b/app/aviary/templates/aviary/aviary_all.html
index 1b9f517..6ed3522 100644
--- a/app/aviary/templates/aviary/aviary_all.html
+++ b/app/aviary/templates/aviary/aviary_all.html
@@ -53,7 +53,7 @@
             </td>
             <td>{{ aviary.condition }}</td>
             <td>{{ aviary.last_ward_round }}</td>
-            <td>{{ aviary.comment }}</td>
+            <td>{{ aviary.comment|default_if_none:"" }}</td>
         </tr>
         {% endfor %}
     </tbody>
diff --git a/app/aviary/templates/aviary/aviary_single.html b/app/aviary/templates/aviary/aviary_single.html
index 23c629b..73c7417 100644
--- a/app/aviary/templates/aviary/aviary_single.html
+++ b/app/aviary/templates/aviary/aviary_single.html
@@ -14,25 +14,27 @@
             </fieldset>
         </form>
     </div>
-
-    <div class="col-lg-5">
+    <div class="col-lg-1 mb-3"></div>
+    <div class="col-lg-4">
         <h4>
-            Zustand
+            Patienten der Voliere
         </h4>
+        <p>Hier finden Sie die Patienten, die momentan in der Voliere {{ aviary.description }} untergebracht sind.</p>
         <p>
-            Lorem ipsum dolor sit, amet consectetur adipisicing elit.
-            Reiciendis, hic enim pariatur, exercitationem, repellat quasi sit
-            temporibus dicta voluptate in voluptates. Alias deserunt sint
-            suscipit explicabo et. Perferendis, dolor praesentium.
-        </p>
-        <h4>
-            Letzte Inspektion
-        </h4>
-        <p>
-            Lorem ipsum dolor sit, amet consectetur adipisicing elit.
-            Reiciendis, hic enim pariatur, exercitationem, repellat quasi sit
-            temporibus dicta voluptate in voluptates. Alias deserunt sint
-            suscipit explicabo et. Perferendis, dolor praesentium.
+            {% for bird in birds %}
+            <div class="card bg-light mb-3" style="max-width: 30rem;">
+                <div class="card-header"><h5 class="card-title">Patient: {{bird.bird_identifier}}</h5></div>
+                <div class="card-body">
+                    <p class="card-text">
+                        <strong>Vogel:</strong> {{bird.bird}}<br>
+                        <strong>gefunden am:</strong> {{bird.created}}<br>
+                        <strong>Statusänderung am:</strong> {{bird.updated}}<br>
+                        <strong>Fundumstände:</strong> {{bird.find_circumstances}}<br>
+                        <strong>Diagnose:</strong> {{bird.diagnostic_finding}}<br>
+                    </p>
+                </div>
+            </div>
+            {% endfor %}
         </p>
     </div>
 </div>
diff --git a/app/aviary/views.py b/app/aviary/views.py
index 62a885f..cdbaf97 100644
--- a/app/aviary/views.py
+++ b/app/aviary/views.py
@@ -3,6 +3,7 @@ from django.shortcuts import render, redirect
 
 from .models import Aviary
 from .forms import AviaryEditForm
+from bird.models import FallenBird
 
 
 @login_required(login_url="account_login")
@@ -15,11 +16,12 @@ def aviary_all(request):
 @login_required(login_url="account_login")
 def aviary_single(request, id):
     aviary = Aviary.objects.get(id=id)
+    birds = FallenBird.objects.filter(aviary_id=id).order_by("created")
     form = AviaryEditForm(request.POST or None, instance=aviary)
     if request.method == "POST":
         if form.is_valid():
             form.save()
             return redirect("aviary_all")
 
-    context = {"aviary": aviary, "form": form}
+    context = {"aviary": aviary, "birds": birds, "form": form}
     return render(request, "aviary/aviary_single.html", context)