diff --git a/aviary/templates/aviary/aviary_all.html b/aviary/templates/aviary/aviary_all.html
index e69de29..f8e95ba 100644
--- a/aviary/templates/aviary/aviary_all.html
+++ b/aviary/templates/aviary/aviary_all.html
@@ -0,0 +1,60 @@
+{% extends "base.html" %}
+{% load static %}
+{% block header %}
+<!-- Datatable CSS -->
+<link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/dataTables.bootstrap5.min.css" />
+<link rel="stylesheet" href="https://cdn.datatables.net/responsive/2.2.9/css/responsive.bootstrap5.min.css">
+
+<!-- jQuery -->
+<script src="https://code.jquery.com/jquery-3.5.1.js"></script>
+
+<!-- Datatable jQuery -->
+<script src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.min.js"></script>
+<script src="https://cdn.datatables.net/1.11.3/js/dataTables.bootstrap5.min.js"></script>
+<script src="https://cdn.datatables.net/responsive/2.2.9/js/dataTables.responsive.min.js"></script>
+<script src="https://cdn.datatables.net/responsive/2.2.9/js/responsive.bootstrap5.min.js"></script>
+
+<script>
+    $(document).ready(function () {
+        $('#t__aviary_all').DataTable({
+            language: {
+                url: 'https://cdn.datatables.net/plug-ins/1.11.3/i18n/de_de.json',
+            },
+            paging: false,
+            info: false,
+            responsive: true,
+            columnDefs: [
+                { responsivePriority: 1, targets: 0 },
+            ]
+        })
+    })
+</script>
+
+{% endblock header %}
+{% block content %}
+<h3>Übersicht aller Volieren</h3>
+<p>
+    Die Übersicht aller Volieren.
+</p>
+<table class="table table-striped table-hover display responsive nowrap" width="100%" id="t__aviary_all">
+    <thead>
+        <tr>
+            <th>Bezeichnung</th>
+            <th>Zustand</th>
+            <th>letzte Inspektion</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for aviary in aviaries %}
+        <tr>
+            <td>
+                <a href="{% url 'aviary_single' aviary.id %}">{{ aviary.description }}</a>
+            </td>
+            <td>{{ aviary.condition }}</td>
+            <td>{{ aviary.last_ward_round }}</td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/aviary/templates/aviary/aviary_single.html b/aviary/templates/aviary/aviary_single.html
new file mode 100644
index 0000000..e69de29
diff --git a/aviary/urls.py b/aviary/urls.py
index 1e77154..e1359fa 100644
--- a/aviary/urls.py
+++ b/aviary/urls.py
@@ -1,9 +1,11 @@
 from django.urls import path
 
 from .views import (
-    aviary_all
+    aviary_all,
+    aviary_single
 )
 
 urlpatterns = [
     path("all/", aviary_all, name="aviary_all"),
+    path("<id>", aviary_single, name="aviary_single"),
 ]
diff --git a/aviary/views.py b/aviary/views.py
index 3e76332..5858d24 100644
--- a/aviary/views.py
+++ b/aviary/views.py
@@ -9,3 +9,10 @@ def aviary_all(request):
     aviaries = Aviary.objects.all()
     context = {"aviaries": aviaries}
     return render(request, "aviary/aviary_all.html", context)
+
+
+@login_required(login_url="account_login")
+def aviary_single(request, id):
+    aviary = Aviary.objects.get(id=id)
+    context = {"aviary": aviary}
+    return render(request, "aviary/aviary_single.html", context)
diff --git a/rescuer/templates/rescuer/rescuer_edit.html b/rescuer/templates/rescuer/rescuer_edit.html
index f0b5002..9c8f0fa 100644
--- a/rescuer/templates/rescuer/rescuer_edit.html
+++ b/rescuer/templates/rescuer/rescuer_edit.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %} 
+{% extends 'base.html' %}
 {% load crispy_forms_tags %}
 {% block content %}
 <div class="row">
@@ -6,21 +6,35 @@
     <h3>Adressänderung des Retters</h3>
     <form method="post" class="form-horizontal">
       <fieldset>
-      {% csrf_token %}
-      <div class="row">
-        <div class="col-6">{{ form.first_name|as_crispy_field }}</div>
-        <div class="col-6">{{ form.last_name|as_crispy_field }}</div>
-        <div class="col-8">{{ form.email|as_crispy_field }}</div>
-        <div class="col-8">{{ form.phone|as_crispy_field }}</div>
-        <div class="col-8">{{ form.street|as_crispy_field }}</div>
-        <div class="col-4">{{ form.street_number|as_crispy_field }}</div>
-        <div class="col-8">{{ form.city|as_crispy_field }}</div>
-        <div class="col-4">{{ form.zip_code|as_crispy_field }}</div>
-      </div>
-      <a href="{% url 'rescuer_all' %}" class="btn btn-secondary">Abbruch</a>
-      <button class="btn btn-primary" type="submit">Speichern</button>
-    </fieldset>
-  </form>  
+        {% csrf_token %}
+        <div class="row">
+          <div class="col-6">{{ form.first_name|as_crispy_field }}</div>
+          <div class="col-6">{{ form.last_name|as_crispy_field }}</div>
+          <div class="col-6">{{ form.email|as_crispy_field }}</div>
+          <div class="col-6">{{ form.phone|as_crispy_field }}</div>
+          <div class="col-8">{{ form.street|as_crispy_field }}</div>
+          <div class="col-4">{{ form.street_number|as_crispy_field }}</div>
+          <div class="col-8">{{ form.city|as_crispy_field }}</div>
+          <div class="col-4">{{ form.zip_code|as_crispy_field }}</div>
+        </div>
+        <a href="{% url 'rescuer_all' %}" class="btn btn-secondary">Abbruch</a>
+        <button class="btn btn-primary" type="submit">Speichern</button>
+      </fieldset>
+    </form>
+  </div>
+  <div class="col-lg-5">
+    <h4>Eins</h4>
+    <p>Lorem ipsum dolor sit, amet consectetur adipisicing elit. Provident rem voluptates, facere voluptatum laudantium
+      voluptate possimus porro. Ab veritatis impedit esse architecto sit dolores, tempore officia! Nemo magni voluptate
+      officiis?</p>
+    <h4>Zwei</h4>
+    <p>Lorem ipsum dolor sit, amet consectetur adipisicing elit. Provident rem voluptates, facere voluptatum laudantium
+      voluptate possimus porro. Ab veritatis impedit esse architecto sit dolores, tempore officia! Nemo magni voluptate
+      officiis?</p>
+    <h4>Drei</h4>
+    <p>Lorem ipsum dolor sit, amet consectetur adipisicing elit. Provident rem voluptates, facere voluptatum laudantium
+      voluptate possimus porro. Ab veritatis impedit esse architecto sit dolores, tempore officia! Nemo magni voluptate
+      officiis?</p>
   </div>
 </div>
 
diff --git a/rescuer/templates/rescuer/rescuer_single.html b/rescuer/templates/rescuer/rescuer_single.html
index 568fdd0..649a7b8 100644
--- a/rescuer/templates/rescuer/rescuer_single.html
+++ b/rescuer/templates/rescuer/rescuer_single.html
@@ -10,10 +10,10 @@
             <div class="card-body">
                 <h4 class="card-title">{{rescuer.first_name}} {{rescuer.last_name}}</h4>
                 <p class="card-text">
-                {{rescuer.city}} {{rescuer.street}}<br>
-                {{rescuer.zip_code}}<br>
-                {{rescuer.email}}<br>
-                {{rescuer.phone}}<br>
+                    {{rescuer.city}} {{rescuer.street}}<br>
+                    {{rescuer.zip_code}}<br>
+                    {{rescuer.email}}<br>
+                    {{rescuer.phone}}<br>
                 </p>
             </div>
         </div>
@@ -21,23 +21,19 @@
         <a href="{% url 'rescuer_delete' rescuer.id %}" class="btn btn-danger">Löschen</a>
         <a href="{% url 'rescuer_edit' rescuer.id %}" class="btn btn-primary">Bearbeiten</a>
     </div>
-<!--
-    <div class="col-lg-7">
-        <h6>eins</h6>
-        <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Officia tempore voluptatibus voluptatum possimus in iusto exercitationem perspiciatis eaque harum, nihil, praesentium debitis nisi unde eligendi, qui sapiente odit expedita aut.</p>
 
-        <h6>zwei</h6>
-        <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Officia tempore voluptatibus voluptatum possimus in iusto exercitationem perspiciatis eaque harum, nihil, praesentium debitis nisi unde eligendi, qui sapiente odit expedita aut.</p>
-
-        <h6>drei</h6>
-        <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Officia tempore voluptatibus voluptatum possimus in iusto exercitationem perspiciatis eaque harum, nihil, praesentium debitis nisi unde eligendi, qui sapiente odit expedita aut.</p>
-    </div>
--->
     <div class="col-lg-6">
-        <h5>zugehörige Patienten</h5>
+        <h4>eins</h4>
+        <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Officia tempore voluptatibus voluptatum possimus in
+            iusto exercitationem perspiciatis eaque harum, nihil, praesentium debitis nisi unde eligendi, qui sapiente
+            odit expedita aut.</p>
+            
+        <h4>zwei</h4>
+        <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Officia tempore voluptatibus voluptatum possimus in
+            iusto exercitationem perspiciatis eaque harum, nihil, praesentium debitis nisi unde eligendi, qui sapiente
+            odit expedita aut.</p>
     </div>
 
-
 </div>
 
 {% endblock content %}
\ No newline at end of file