diff --git a/bird/migrations/0001_initial.py b/bird/migrations/0001_initial.py
index d0269e7..8f5c4e0 100644
--- a/bird/migrations/0001_initial.py
+++ b/bird/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-06-22 15:25
+# Generated by Django 4.2.2 on 2023-06-26 15:48
 
 from django.conf import settings
 from django.db import migrations, models
@@ -11,8 +11,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ("rescuer", "0001_initial"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("rescuer", "0001_initial"),
     ]
 
     operations = [
diff --git a/bird/templates/bird/bird_all.html b/bird/templates/bird/bird_all.html
index 36ffa86..520594c 100644
--- a/bird/templates/bird/bird_all.html
+++ b/bird/templates/bird/bird_all.html
@@ -48,9 +48,9 @@
           <label for="rescuer" class="form-label mt-3">Wählen Sie einen <strong>bereits angelegten</strong>
             Retter aus oder legen Sie einen <strong>neuen</strong> Retter an:</label>
           <select id="rescuer" class="form-select" name="rescuer_id">
-            {% for rescuer in rescuer_modal %}
             <option value="new_rescuer"><strong>neuen
                 Retter anlegen</strong></option>
+            {% for rescuer in rescuer_modal %}
             <option value={{rescuer.id}}>
               {{rescuer.first_name}} {{rescuer.last_name}},
               {{rescuer.street}} {{rescuer.street_number}},
diff --git a/fixtures/data.json b/fixtures/data.json
deleted file mode 100644
index 1588d35..0000000
--- a/fixtures/data.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"model": "admin.logentry", "pk": 1, "fields": {"action_time": "2023-06-22T15:26:04.774Z", "user": 1, "content_type": 12, "object_id": "33cadb1a-aa56-4d77-b64c-628bccba312e", "object_repr": "Amsel", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 2, "fields": {"action_time": "2023-06-22T15:26:09.120Z", "user": 1, "content_type": 12, "object_id": "5d940f70-5acf-4038-8500-4f3a02499259", "object_repr": "Kohlmeise", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 3, "fields": {"action_time": "2023-06-22T15:26:16.325Z", "user": 1, "content_type": 12, "object_id": "5db29073-d014-498f-9456-f3201b3d7920", "object_repr": "Spatz", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 4, "fields": {"action_time": "2023-06-22T15:27:05.231Z", "user": 1, "content_type": 7, "object_id": "1", "object_repr": "gw@email.de", "action_flag": 2, "change_message": "[{\"changed\": {\"fields\": [\"Verified\", \"Primary\"]}}]"}}, {"model": "auth.permission", "pk": 1, "fields": {"name": "Can add log entry", "content_type": 1, "codename": "add_logentry"}}, {"model": "auth.permission", "pk": 2, "fields": {"name": "Can change log entry", "content_type": 1, "codename": "change_logentry"}}, {"model": "auth.permission", "pk": 3, "fields": {"name": "Can delete log entry", "content_type": 1, "codename": "delete_logentry"}}, {"model": "auth.permission", "pk": 4, "fields": {"name": "Can view log entry", "content_type": 1, "codename": "view_logentry"}}, {"model": "auth.permission", "pk": 5, "fields": {"name": "Can add permission", "content_type": 2, "codename": "add_permission"}}, {"model": "auth.permission", "pk": 6, "fields": {"name": "Can change permission", "content_type": 2, "codename": "change_permission"}}, {"model": "auth.permission", "pk": 7, "fields": {"name": "Can delete permission", "content_type": 2, "codename": "delete_permission"}}, {"model": "auth.permission", "pk": 8, "fields": {"name": "Can view permission", "content_type": 2, "codename": "view_permission"}}, {"model": "auth.permission", "pk": 9, "fields": {"name": "Can add group", "content_type": 3, "codename": "add_group"}}, {"model": "auth.permission", "pk": 10, "fields": {"name": "Can change group", "content_type": 3, "codename": "change_group"}}, {"model": "auth.permission", "pk": 11, "fields": {"name": "Can delete group", "content_type": 3, "codename": "delete_group"}}, {"model": "auth.permission", "pk": 12, "fields": {"name": "Can view group", "content_type": 3, "codename": "view_group"}}, {"model": "auth.permission", "pk": 13, "fields": {"name": "Can add user", "content_type": 4, "codename": "add_user"}}, {"model": "auth.permission", "pk": 14, "fields": {"name": "Can change user", "content_type": 4, "codename": "change_user"}}, {"model": "auth.permission", "pk": 15, "fields": {"name": "Can delete user", "content_type": 4, "codename": "delete_user"}}, {"model": "auth.permission", "pk": 16, "fields": {"name": "Can view user", "content_type": 4, "codename": "view_user"}}, {"model": "auth.permission", "pk": 17, "fields": {"name": "Can add content type", "content_type": 5, "codename": "add_contenttype"}}, {"model": "auth.permission", "pk": 18, "fields": {"name": "Can change content type", "content_type": 5, "codename": "change_contenttype"}}, {"model": "auth.permission", "pk": 19, "fields": {"name": "Can delete content type", "content_type": 5, "codename": "delete_contenttype"}}, {"model": "auth.permission", "pk": 20, "fields": {"name": "Can view content type", "content_type": 5, "codename": "view_contenttype"}}, {"model": "auth.permission", "pk": 21, "fields": {"name": "Can add session", "content_type": 6, "codename": "add_session"}}, {"model": "auth.permission", "pk": 22, "fields": {"name": "Can change session", "content_type": 6, "codename": "change_session"}}, {"model": "auth.permission", "pk": 23, "fields": {"name": "Can delete session", "content_type": 6, "codename": "delete_session"}}, {"model": "auth.permission", "pk": 24, "fields": {"name": "Can view session", "content_type": 6, "codename": "view_session"}}, {"model": "auth.permission", "pk": 25, "fields": {"name": "Can add email address", "content_type": 7, "codename": "add_emailaddress"}}, {"model": "auth.permission", "pk": 26, "fields": {"name": "Can change email address", "content_type": 7, "codename": "change_emailaddress"}}, {"model": "auth.permission", "pk": 27, "fields": {"name": "Can delete email address", "content_type": 7, "codename": "delete_emailaddress"}}, {"model": "auth.permission", "pk": 28, "fields": {"name": "Can view email address", "content_type": 7, "codename": "view_emailaddress"}}, {"model": "auth.permission", "pk": 29, "fields": {"name": "Can add email confirmation", "content_type": 8, "codename": "add_emailconfirmation"}}, {"model": "auth.permission", "pk": 30, "fields": {"name": "Can change email confirmation", "content_type": 8, "codename": "change_emailconfirmation"}}, {"model": "auth.permission", "pk": 31, "fields": {"name": "Can delete email confirmation", "content_type": 8, "codename": "delete_emailconfirmation"}}, {"model": "auth.permission", "pk": 32, "fields": {"name": "Can view email confirmation", "content_type": 8, "codename": "view_emailconfirmation"}}, {"model": "auth.permission", "pk": 33, "fields": {"name": "Can add social account", "content_type": 9, "codename": "add_socialaccount"}}, {"model": "auth.permission", "pk": 34, "fields": {"name": "Can change social account", "content_type": 9, "codename": "change_socialaccount"}}, {"model": "auth.permission", "pk": 35, "fields": {"name": "Can delete social account", "content_type": 9, "codename": "delete_socialaccount"}}, {"model": "auth.permission", "pk": 36, "fields": {"name": "Can view social account", "content_type": 9, "codename": "view_socialaccount"}}, {"model": "auth.permission", "pk": 37, "fields": {"name": "Can add social application", "content_type": 10, "codename": "add_socialapp"}}, {"model": "auth.permission", "pk": 38, "fields": {"name": "Can change social application", "content_type": 10, "codename": "change_socialapp"}}, {"model": "auth.permission", "pk": 39, "fields": {"name": "Can delete social application", "content_type": 10, "codename": "delete_socialapp"}}, {"model": "auth.permission", "pk": 40, "fields": {"name": "Can view social application", "content_type": 10, "codename": "view_socialapp"}}, {"model": "auth.permission", "pk": 41, "fields": {"name": "Can add social application token", "content_type": 11, "codename": "add_socialtoken"}}, {"model": "auth.permission", "pk": 42, "fields": {"name": "Can change social application token", "content_type": 11, "codename": "change_socialtoken"}}, {"model": "auth.permission", "pk": 43, "fields": {"name": "Can delete social application token", "content_type": 11, "codename": "delete_socialtoken"}}, {"model": "auth.permission", "pk": 44, "fields": {"name": "Can view social application token", "content_type": 11, "codename": "view_socialtoken"}}, {"model": "auth.permission", "pk": 45, "fields": {"name": "Can add bird", "content_type": 12, "codename": "add_bird"}}, {"model": "auth.permission", "pk": 46, "fields": {"name": "Can change bird", "content_type": 12, "codename": "change_bird"}}, {"model": "auth.permission", "pk": 47, "fields": {"name": "Can delete bird", "content_type": 12, "codename": "delete_bird"}}, {"model": "auth.permission", "pk": 48, "fields": {"name": "Can view bird", "content_type": 12, "codename": "view_bird"}}, {"model": "auth.permission", "pk": 49, "fields": {"name": "Can add fallen bird", "content_type": 13, "codename": "add_fallenbird"}}, {"model": "auth.permission", "pk": 50, "fields": {"name": "Can change fallen bird", "content_type": 13, "codename": "change_fallenbird"}}, {"model": "auth.permission", "pk": 51, "fields": {"name": "Can delete fallen bird", "content_type": 13, "codename": "delete_fallenbird"}}, {"model": "auth.permission", "pk": 52, "fields": {"name": "Can view fallen bird", "content_type": 13, "codename": "view_fallenbird"}}, {"model": "auth.permission", "pk": 53, "fields": {"name": "Can add rescuer", "content_type": 14, "codename": "add_rescuer"}}, {"model": "auth.permission", "pk": 54, "fields": {"name": "Can change rescuer", "content_type": 14, "codename": "change_rescuer"}}, {"model": "auth.permission", "pk": 55, "fields": {"name": "Can delete rescuer", "content_type": 14, "codename": "delete_rescuer"}}, {"model": "auth.permission", "pk": 56, "fields": {"name": "Can view rescuer", "content_type": 14, "codename": "view_rescuer"}}, {"model": "auth.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$600000$7QXxf7AhnKE4Dc2GMAvP6N$tyXsG1//Nbnd0H4C2PaEye94FSkelM5F1dyPB5jqfI0=", "last_login": "2023-06-22T15:26:54.743Z", "is_superuser": true, "username": "gw", "first_name": "", "last_name": "", "email": "gw@email.de", "is_staff": true, "is_active": true, "date_joined": "2023-06-22T15:25:30.120Z", "groups": [], "user_permissions": []}}, {"model": "contenttypes.contenttype", "pk": 1, "fields": {"app_label": "admin", "model": "logentry"}}, {"model": "contenttypes.contenttype", "pk": 2, "fields": {"app_label": "auth", "model": "permission"}}, {"model": "contenttypes.contenttype", "pk": 3, "fields": {"app_label": "auth", "model": "group"}}, {"model": "contenttypes.contenttype", "pk": 4, "fields": {"app_label": "auth", "model": "user"}}, {"model": "contenttypes.contenttype", "pk": 5, "fields": {"app_label": "contenttypes", "model": "contenttype"}}, {"model": "contenttypes.contenttype", "pk": 6, "fields": {"app_label": "sessions", "model": "session"}}, {"model": "contenttypes.contenttype", "pk": 7, "fields": {"app_label": "account", "model": "emailaddress"}}, {"model": "contenttypes.contenttype", "pk": 8, "fields": {"app_label": "account", "model": "emailconfirmation"}}, {"model": "contenttypes.contenttype", "pk": 9, "fields": {"app_label": "socialaccount", "model": "socialaccount"}}, {"model": "contenttypes.contenttype", "pk": 10, "fields": {"app_label": "socialaccount", "model": "socialapp"}}, {"model": "contenttypes.contenttype", "pk": 11, "fields": {"app_label": "socialaccount", "model": "socialtoken"}}, {"model": "contenttypes.contenttype", "pk": 12, "fields": {"app_label": "bird", "model": "bird"}}, {"model": "contenttypes.contenttype", "pk": 13, "fields": {"app_label": "bird", "model": "fallenbird"}}, {"model": "contenttypes.contenttype", "pk": 14, "fields": {"app_label": "rescuer", "model": "rescuer"}}, {"model": "sessions.session", "pk": "1rbvosk1xbmnku0fiuapuenm6wsy6pa7", "fields": {"session_data": ".eJxVjs0OgjAQhN-lZ2no9gfWo3efgey2W0ENJBROxncXEmI0c5v5ZjIv1dG69N1aZO6GpM7KqNOvxxQfMu5ButN4m3ScxmUeWO-IPtKir1OS5-Vg_wZ6Kv3WZmpJmhgocUK39Yyh4LIlZ3z2NZAYZrAYxfEmH5oaGHLOAtJkb7fRWUpcvze9NUAJqpp8qlzLtkIkrLAJwaEHxFrU-wMsn0au:1qCMhg:eBdny0vZFxEo21uJP55dz13TlF8XLaPuBCytMmZ3JfQ", "expire_date": "2023-07-06T15:58:36.647Z"}}, {"model": "account.emailaddress", "pk": 1, "fields": {"user": 1, "email": "gw@email.de", "verified": true, "primary": true}}, {"model": "bird.fallenbird", "pk": "8846361b-417f-419f-a12b-fa65fb0e3d7e", "fields": {"bird": "33cadb1a-aa56-4d77-b64c-628bccba312e", "date_found": "2023-06-22", "place": "Am Planetarium 2", "created": "2023-06-22T15:27:57.829Z", "updated": "2023-06-22T15:27:57.829Z", "rescuer": "4e2c6512-967c-48e7-afe7-7ebf6280912b", "user": 1}}, {"model": "bird.bird", "pk": "33cadb1a-aa56-4d77-b64c-628bccba312e", "fields": {"name": "Amsel"}}, {"model": "bird.bird", "pk": "5d940f70-5acf-4038-8500-4f3a02499259", "fields": {"name": "Kohlmeise"}}, {"model": "bird.bird", "pk": "5db29073-d014-498f-9456-f3201b3d7920", "fields": {"name": "Spatz"}}, {"model": "rescuer.rescuer", "pk": "15312ad2-0a5d-48b3-99a9-97664952990e", "fields": {"gender": "Herr", "first_name": "Butz", "last_name": "Piggy", "street": "Friedenstraße", "street_number": "22", "city": "Dreamworld", "zip_code": "08873", "state": "Deutschland", "date_of_birth": "1988-02-23", "email": "pb@email.de", "user": 1}}, {"model": "rescuer.rescuer", "pk": "4e2c6512-967c-48e7-afe7-7ebf6280912b", "fields": {"gender": "Frau", "first_name": "Angela", "last_name": "Davis", "street": "hierStraße", "street_number": "42", "city": "Dreamworld", "zip_code": "08873", "state": "Deutschland", "date_of_birth": "2024-07-23", "email": "ad@email.de", "user": 1}}]
\ No newline at end of file
diff --git a/rescuer/admin.py b/rescuer/admin.py
index 3b13da0..77b0c3c 100644
--- a/rescuer/admin.py
+++ b/rescuer/admin.py
@@ -12,6 +12,7 @@ class CustomerAdmin(admin.ModelAdmin):
         "street",
         "street_number",
         "city",
-        "state",
+        "email",
+        "phone",
         "user",
     ]
diff --git a/rescuer/forms.py b/rescuer/forms.py
index 897ae1e..4e500df 100644
--- a/rescuer/forms.py
+++ b/rescuer/forms.py
@@ -10,29 +10,24 @@ class DateInput(forms.DateInput):
 
 class RescuerForm(forms.ModelForm):
     class Meta:
-        widgets = {"date_of_birth": DateInput(format="%Y-%m-%d")}
         model = Rescuer
         fields = [
-            "gender",
             "first_name",
             "last_name",
             "street",
             "street_number",
             "zip_code",
             "city",
-            "state",
-            "date_of_birth",
             "email",
+            "phone",
         ]
         labels = {
-            "gender": _("Geschlecht"),
             "first_name": _("Vorname"),
             "last_name": _("Nachname"),
-            "date_of_birth": _("Geburtstag"),
             "street": _("Straße"),
             "street_number": _("Hausnummer"),
             "zip_code": _("Postleitzahl"),
             "city": _("Stadt"),
-            "state": _("Land"),
             "email": _("Email"),
+            "phone": _("Telefon"),
         }
diff --git a/rescuer/migrations/0001_initial.py b/rescuer/migrations/0001_initial.py
index 4f21df6..cd9f360 100644
--- a/rescuer/migrations/0001_initial.py
+++ b/rescuer/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-06-22 15:25
+# Generated by Django 4.2.2 on 2023-06-26 15:48
 
 from django.conf import settings
 from django.db import migrations, models
@@ -27,31 +27,14 @@ class Migration(migrations.Migration):
                         serialize=False,
                     ),
                 ),
-                (
-                    "gender",
-                    models.CharField(
-                        choices=[
-                            ("Frau", "Frau"),
-                            ("Herr", "Herr"),
-                            ("Divers", "Divers"),
-                        ],
-                        max_length=10,
-                    ),
-                ),
                 ("first_name", models.CharField(max_length=200)),
                 ("last_name", models.CharField(max_length=200)),
                 ("street", models.CharField(max_length=200)),
                 ("street_number", models.CharField(max_length=20)),
                 ("city", models.CharField(max_length=200)),
                 ("zip_code", models.CharField(max_length=200)),
-                (
-                    "state",
-                    models.CharField(
-                        choices=[("Deutschland", "Deutschland")], max_length=200
-                    ),
-                ),
-                ("date_of_birth", models.DateField()),
                 ("email", models.EmailField(max_length=200)),
+                ("phone", models.EmailField(max_length=200)),
                 (
                     "user",
                     models.ForeignKey(
diff --git a/rescuer/models.py b/rescuer/models.py
index 2b54c5f..a19b504 100644
--- a/rescuer/models.py
+++ b/rescuer/models.py
@@ -4,25 +4,17 @@ from uuid import uuid4
 from django.conf import settings
 from django.db import models
 
-STATE_CHOICES = [
-    ("Deutschland", "Deutschland"),
-]
-
-GENDER_CHOICES = [("Frau", "Frau"), ("Herr", "Herr"), ("Divers", "Divers")]
-
 
 class Rescuer(models.Model):
     id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
-    gender = models.CharField(max_length=10, choices=GENDER_CHOICES)
     first_name = models.CharField(max_length=200)
     last_name = models.CharField(max_length=200)
     street = models.CharField(max_length=200)
     street_number = models.CharField(max_length=20)
     city = models.CharField(max_length=200)
     zip_code = models.CharField(max_length=200)
-    state = models.CharField(max_length=200, choices=STATE_CHOICES)
-    date_of_birth = models.DateField()
     email = models.EmailField(max_length=200)
+    phone = models.CharField(max_length=200)
     user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
 
     def __str__(self) -> str:
diff --git a/rescuer/templates/rescuer/rescuer_all.html b/rescuer/templates/rescuer/rescuer_all.html
index 7f26181..7961cc4 100644
--- a/rescuer/templates/rescuer/rescuer_all.html
+++ b/rescuer/templates/rescuer/rescuer_all.html
@@ -48,6 +48,8 @@
         <th>Straße</th>
         <th>PLZ</th>
         <th>Ort</th>
+        <th>Email</th>
+        <th>Phone</th>
       </tr>
     </thead>
     <tbody>
@@ -60,6 +62,8 @@
         <td>{{ rescuer.street }} {{ rescuer.street_number }}</td>
         <td>{{ rescuer.zip_code }}</td>
         <td>{{ rescuer.city }}</td>
+        <td>{{ rescuer.email }}</td>
+        <td>{{ rescuer.phone }}</td>
       </tr>
       {% endfor %}
     </tbody>
diff --git a/rescuer/templates/rescuer/rescuer_create.html b/rescuer/templates/rescuer/rescuer_create.html
index 7c3ad26..dd9b848 100644
--- a/rescuer/templates/rescuer/rescuer_create.html
+++ b/rescuer/templates/rescuer/rescuer_create.html
@@ -7,16 +7,14 @@
         <form method="post" class="form-horizontal">
             {% csrf_token %}
             <div class="row">
-                <div class="col-md-12 col-lg-12">{{ form.gender|as_crispy_field }}</div>
                 <div class="col-md-12 col-lg-6">{{ form.first_name|as_crispy_field }}</div>
                 <div class="col-md-12 col-lg-6">{{ form.last_name|as_crispy_field }}</div>
-                <div class="col-md-12 col-lg-8">{{ form.email|as_crispy_field }}</div>
-                <div class="col-md-12 col-lg-4">{{ form.date_of_birth|as_crispy_field }}</div>
                 <div class="col-md-12 col-lg-8">{{ form.street|as_crispy_field }}</div>
                 <div class="col-md-12 col-lg-4">{{ form.street_number|as_crispy_field }}</div>
                 <div class="col-md-12 col-lg-8">{{ form.city|as_crispy_field }}</div>
                 <div class="col-md-12 col-lg-4">{{ form.zip_code|as_crispy_field }}</div>
-                <div class="col-md-12 col-lg-12">{{ form.state|as_crispy_field }}</div>
+                <div class="col-md-12 col-lg-6">{{ form.email|as_crispy_field }}</div>
+                <div class="col-md-12 col-lg-6">{{ form.phone|as_crispy_field }}</div>
             </div>
             <a href="{% url 'bird_all' %}" class="btn btn-danger">Abbruch</a>
             <button class="btn btn-primary" type="submit">Speichern</button>
diff --git a/rescuer/templates/rescuer/rescuer_edit.html b/rescuer/templates/rescuer/rescuer_edit.html
index 34e7478..f0b5002 100644
--- a/rescuer/templates/rescuer/rescuer_edit.html
+++ b/rescuer/templates/rescuer/rescuer_edit.html
@@ -8,21 +8,19 @@
       <fieldset>
       {% csrf_token %}
       <div class="row">
-        <div class="col-12">{{ form.gender|as_crispy_field }}</div>
         <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-4">{{ form.date_of_birth|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 class="col-12">{{ form.state|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    
+  </form>  
   </div>
 </div>
 
diff --git a/rescuer/templates/rescuer/rescuer_single.html b/rescuer/templates/rescuer/rescuer_single.html
index b22a34e..568fdd0 100644
--- a/rescuer/templates/rescuer/rescuer_single.html
+++ b/rescuer/templates/rescuer/rescuer_single.html
@@ -12,7 +12,8 @@
                 <p class="card-text">
                 {{rescuer.city}} {{rescuer.street}}<br>
                 {{rescuer.zip_code}}<br>
-                {{rescuer.state}}<br>
+                {{rescuer.email}}<br>
+                {{rescuer.phone}}<br>
                 </p>
             </div>
         </div>