diff --git a/fbf/templates/fbf/birds_all.html b/fbf/templates/fbf/bird_all.html
similarity index 87%
rename from fbf/templates/fbf/birds_all.html
rename to fbf/templates/fbf/bird_all.html
index 81e8752..489cd3b 100644
--- a/fbf/templates/fbf/birds_all.html
+++ b/fbf/templates/fbf/bird_all.html
@@ -8,7 +8,7 @@
       <th>Vogel</th>
       <th>Finder</th>
       <th>Fundort</th>
-      <th>angelegt am</th>
+      <th>gefunden am</th>
     </tr>
   </thead>
   <tbody>
@@ -21,7 +21,7 @@
         <a href="{% url 'rescuer_single' bird.rescuer_id %}">{{ bird.rescuer }}</a>
       </td>
       <td>{{ bird.place }}</td>
-      <td>{{ bird.created }}</td>
+      <td>{{ bird.date_found }}</td>
     </tr>
     {% endfor %}
   </tbody>
diff --git a/fbf/templates/fbf/bird_delete.html b/fbf/templates/fbf/bird_delete.html
new file mode 100644
index 0000000..d274339
--- /dev/null
+++ b/fbf/templates/fbf/bird_delete.html
@@ -0,0 +1,26 @@
+{% extends 'base.html' %}
+
+{% block content %}
+<h3>Patient löschen</h3>
+<div class="row mt-3">
+    <div class="col-lg-7">
+        <form method="post">
+            {% csrf_token %}
+            <div class="alert alert-dismissible alert-danger">
+                <h4 class="alert-heading">Warnung!</h4>
+                <p class="mb-0">Wollen Sie den Vogel <strong>{{bird.bird}}</strong>
+                    Reg-Num.: <strong>{{bird.id}}</strong> löschen?</p>
+            </div>
+            </p>
+            <a href="{% url 'bird_all'%}" class="btn btn-secondary">Abbruch</a>
+            <button class="btn btn-danger" type="submit">Löschen</button>
+        </form>
+    </div>
+    <div class="col-lg-5">
+        <h5>Vogel löschen</h5>
+        <p>
+            Hinweis zum Löschen eines Vogels!
+        </p>
+    </div>
+</div>
+{% endblock content %}
\ No newline at end of file
diff --git a/fbf/templates/fbf/bird_single.html b/fbf/templates/fbf/bird_single.html
new file mode 100644
index 0000000..cc0cb71
--- /dev/null
+++ b/fbf/templates/fbf/bird_single.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% load static %}
+{% load crispy_forms_tags %}
+{% block content %}
+<h3>Patient {{ bird.bird }} bearbeiten</h3>
+<div class="row">
+    <div class="col-lg-6 mb-3">
+        <form method="post" enctype="multipart/form-data">
+            <fieldset>
+                {% csrf_token %}
+                {{form|crispy}}
+                <button class="btn btn-success" type="abbort">Abbrechen</button>
+                <a href="{% url 'bird_delete' bird.id %}" class="btn btn-danger">Löschen</a>
+                <button class="btn btn-primary" type="submit">Speichern und zur Übersicht</button>
+            </fieldset>
+        </form>
+    </div>
+    {% endblock content %}
\ No newline at end of file
diff --git a/fbf/templates/fbf/birds_single.html b/fbf/templates/fbf/birds_single.html
deleted file mode 100644
index 8f9953f..0000000
--- a/fbf/templates/fbf/birds_single.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "base.html" %}
-{% load static %}
-{% block content %}
-<h3>{{ bird.bird }}</h3>
-<p>{{ bird.id }}</p>
-<p> form </p>
-<p>änder und löschen</p>
-{% endblock content %}
\ No newline at end of file
diff --git a/rescuer/templates/rescuer/rescuer_single.html b/rescuer/templates/rescuer/rescuer_single.html
index 4dc1d4e..9bfaba7 100644
--- a/rescuer/templates/rescuer/rescuer_single.html
+++ b/rescuer/templates/rescuer/rescuer_single.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load static %}
+{% load crispy_forms_tags %}
 {% block content %}
 <h3>{{ rescuer.first_name }} {{ rescuer.last_name }}</h3>