diff --git a/main/admin.py b/main/admin.py
index 00ea92a..6273617 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -9,10 +9,11 @@ class ContributorsAdmin(admin.ModelAdmin):
 admin.site.register(models.week)
 admin.site.register(models.group)
 admin.site.register(models.info)
+admin.site.register(models.place)
 
-@admin.register(models.service_meeting)
+@admin.register(models.service)
 class ServiceMeetingAdmin(admin.ModelAdmin):
-    list_display = ["id", "week", "date", "time", "type", "speaker"]
+    list_display = ["id", "week", "date_1", "time_1", "type_1", "speaker_1"]
 
 @admin.register(models.steward)
 class StewardAdmin(admin.ModelAdmin):
diff --git a/main/migrations/0006_service_delete_service_meeting.py b/main/migrations/0006_service_delete_service_meeting.py
new file mode 100644
index 0000000..f19ca62
--- /dev/null
+++ b/main/migrations/0006_service_delete_service_meeting.py
@@ -0,0 +1,48 @@
+# Generated by Django 5.0.4 on 2024-04-09 06:27
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0005_group_info'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='service',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date_1', models.DateField()),
+                ('time_1', models.TimeField()),
+                ('type_1', models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')])),
+                ('date_2', models.DateField()),
+                ('time_2', models.TimeField()),
+                ('type_2', models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')])),
+                ('date_3', models.DateField()),
+                ('time_3', models.TimeField()),
+                ('type_3', models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')])),
+                ('date_4', models.DateField()),
+                ('time_4', models.TimeField()),
+                ('type_4', models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')])),
+                ('date_5', models.DateField()),
+                ('time_5', models.TimeField()),
+                ('type_5', models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')])),
+                ('date_6', models.DateField()),
+                ('time_6', models.TimeField()),
+                ('type_6', models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')])),
+                ('speaker_1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='speaker_1', to='main.contributors')),
+                ('speaker_2', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='speaker_2', to='main.contributors')),
+                ('speaker_3', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='speaker_3', to='main.contributors')),
+                ('speaker_4', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='speaker_4', to='main.contributors')),
+                ('speaker_5', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='speaker_5', to='main.contributors')),
+                ('speaker_6', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='speaker_6', to='main.contributors')),
+                ('week', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.week')),
+            ],
+        ),
+        migrations.DeleteModel(
+            name='service_meeting',
+        ),
+    ]
diff --git a/main/migrations/0007_alter_service_date_2_alter_service_date_3_and_more.py b/main/migrations/0007_alter_service_date_2_alter_service_date_3_and_more.py
new file mode 100644
index 0000000..c24c99f
--- /dev/null
+++ b/main/migrations/0007_alter_service_date_2_alter_service_date_3_and_more.py
@@ -0,0 +1,114 @@
+# Generated by Django 5.0.4 on 2024-04-09 06:31
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0006_service_delete_service_meeting'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='service',
+            name='date_2',
+            field=models.DateField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='date_3',
+            field=models.DateField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='date_4',
+            field=models.DateField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='date_5',
+            field=models.DateField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='date_6',
+            field=models.DateField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='speaker_2',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='speaker_2', to='main.contributors'),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='speaker_3',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='speaker_3', to='main.contributors'),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='speaker_4',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='speaker_4', to='main.contributors'),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='speaker_5',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='speaker_5', to='main.contributors'),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='speaker_6',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='speaker_6', to='main.contributors'),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='time_2',
+            field=models.TimeField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='time_3',
+            field=models.TimeField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='time_4',
+            field=models.TimeField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='time_5',
+            field=models.TimeField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='time_6',
+            field=models.TimeField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='type_2',
+            field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')], null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='type_3',
+            field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')], null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='type_4',
+            field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')], null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='type_5',
+            field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')], null=True),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='type_6',
+            field=models.IntegerField(choices=[(1, 'Saal'), (2, 'Zoom')], null=True),
+        ),
+    ]
diff --git a/main/migrations/0008_week_place.py b/main/migrations/0008_week_place.py
new file mode 100644
index 0000000..808e473
--- /dev/null
+++ b/main/migrations/0008_week_place.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.4 on 2024-04-09 08:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0007_alter_service_date_2_alter_service_date_3_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='week',
+            name='place',
+            field=models.CharField(default='Alsfeld', max_length=50),
+        ),
+    ]
diff --git a/main/migrations/0009_place_alter_week_place.py b/main/migrations/0009_place_alter_week_place.py
new file mode 100644
index 0000000..2177787
--- /dev/null
+++ b/main/migrations/0009_place_alter_week_place.py
@@ -0,0 +1,26 @@
+# Generated by Django 5.0.4 on 2024-04-09 08:41
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0008_week_place'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='place',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='week',
+            name='place',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.place'),
+        ),
+    ]
diff --git a/main/migrations/0010_remove_week_place_week_assembly.py b/main/migrations/0010_remove_week_place_week_assembly.py
new file mode 100644
index 0000000..492ae18
--- /dev/null
+++ b/main/migrations/0010_remove_week_place_week_assembly.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0.4 on 2024-04-09 08:43
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0009_place_alter_week_place'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='week',
+            name='place',
+        ),
+        migrations.AddField(
+            model_name='week',
+            name='assembly',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='main.place'),
+        ),
+    ]
diff --git a/main/migrations/0011_remove_week_assembly.py b/main/migrations/0011_remove_week_assembly.py
new file mode 100644
index 0000000..a56005b
--- /dev/null
+++ b/main/migrations/0011_remove_week_assembly.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.4 on 2024-04-09 08:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0010_remove_week_place_week_assembly'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='week',
+            name='assembly',
+        ),
+    ]
diff --git a/main/migrations/0012_week_place.py b/main/migrations/0012_week_place.py
new file mode 100644
index 0000000..5692fd9
--- /dev/null
+++ b/main/migrations/0012_week_place.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.4 on 2024-04-09 08:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0011_remove_week_assembly'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='week',
+            name='place',
+            field=models.CharField(default='Alsfeld', max_length=50),
+        ),
+    ]
diff --git a/main/migrations/0013_delete_place.py b/main/migrations/0013_delete_place.py
new file mode 100644
index 0000000..df2309c
--- /dev/null
+++ b/main/migrations/0013_delete_place.py
@@ -0,0 +1,16 @@
+# Generated by Django 5.0.4 on 2024-04-09 08:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0012_week_place'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='place',
+        ),
+    ]
diff --git a/main/migrations/0014_remove_week_place.py b/main/migrations/0014_remove_week_place.py
new file mode 100644
index 0000000..76b9bf9
--- /dev/null
+++ b/main/migrations/0014_remove_week_place.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.4 on 2024-04-09 08:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0013_delete_place'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='week',
+            name='place',
+        ),
+    ]
diff --git a/main/migrations/0015_place.py b/main/migrations/0015_place.py
new file mode 100644
index 0000000..ce43bc2
--- /dev/null
+++ b/main/migrations/0015_place.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.0.4 on 2024-04-09 08:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0014_remove_week_place'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='place',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+            ],
+        ),
+    ]
diff --git a/main/migrations/0016_week_place.py b/main/migrations/0016_week_place.py
new file mode 100644
index 0000000..530105c
--- /dev/null
+++ b/main/migrations/0016_week_place.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0.4 on 2024-04-09 08:56
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0015_place'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='week',
+            name='place',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='main.place'),
+        ),
+    ]
diff --git a/main/migrations/0017_alter_week_place.py b/main/migrations/0017_alter_week_place.py
new file mode 100644
index 0000000..cd95b12
--- /dev/null
+++ b/main/migrations/0017_alter_week_place.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0.4 on 2024-04-09 08:59
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0016_week_place'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='week',
+            name='place',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='main.place'),
+        ),
+    ]
diff --git a/main/models.py b/main/models.py
index b7d864d..cbdcd52 100644
--- a/main/models.py
+++ b/main/models.py
@@ -2,6 +2,12 @@ from django.db import models
 from django.contrib.auth.models import User
 
 # Create your models here.
+class place(models.Model):
+    name = models.CharField(max_length=50)
+
+    def __str__(self):
+        return str(self.id) + " - " + str(self.name)
+
 class contributors(models.Model):
     first_name = models.CharField(max_length=50)
     name = models.CharField(max_length=50)
@@ -24,23 +30,44 @@ class group(models.Model):
 
 class week(models.Model):
     date_of_monday = models.CharField(max_length=50)
+    place = models.ForeignKey(place, on_delete=models.CASCADE,default=1)
 
     def __str__(self):
         return self.date_of_monday
     
-class service_meeting(models.Model):
+class service(models.Model):
     TYPES = (
         (1, 'Saal'),
         (2, 'Zoom'),
     )
     week = models.ForeignKey(week, on_delete=models.CASCADE)
-    date = models.DateField(auto_now_add=False)
-    time = models.TimeField(auto_now_add=False)
-    type = models.IntegerField(auto_created=False, choices=TYPES)
-    speaker = models.ForeignKey(contributors, on_delete=models.CASCADE)
+    date_1 = models.DateField(auto_now_add=False)
+    time_1 = models.TimeField(auto_now_add=False)
+    type_1 = models.IntegerField(auto_created=False, choices=TYPES)
+    speaker_1 = models.ForeignKey(contributors, on_delete=models.CASCADE, related_name="speaker_1")
+    date_2 = models.DateField(auto_now_add=False, null=True)
+    time_2 = models.TimeField(auto_now_add=False, null=True)
+    type_2 = models.IntegerField(auto_created=False, choices=TYPES, null=True)
+    speaker_2 = models.ForeignKey(contributors, on_delete=models.CASCADE, related_name="speaker_2", null=True)
+    date_3 = models.DateField(auto_now_add=False, null=True)
+    time_3 = models.TimeField(auto_now_add=False, null=True)
+    type_3 = models.IntegerField(auto_created=False, choices=TYPES, null=True)
+    speaker_3 = models.ForeignKey(contributors, on_delete=models.CASCADE, related_name="speaker_3", null=True)
+    date_4 = models.DateField(auto_now_add=False, null=True)
+    time_4 = models.TimeField(auto_now_add=False, null=True)
+    type_4 = models.IntegerField(auto_created=False, choices=TYPES, null=True)
+    speaker_4 = models.ForeignKey(contributors, on_delete=models.CASCADE, related_name="speaker_4", null=True)
+    date_5 = models.DateField(auto_now_add=False, null=True)
+    time_5 = models.TimeField(auto_now_add=False, null=True)
+    type_5 = models.IntegerField(auto_created=False, choices=TYPES, null=True)
+    speaker_5 = models.ForeignKey(contributors, on_delete=models.CASCADE, related_name="speaker_5", null=True)
+    date_6 = models.DateField(auto_now_add=False, null=True)
+    time_6 = models.TimeField(auto_now_add=False, null=True)
+    type_6 = models.IntegerField(auto_created=False, choices=TYPES, null=True)
+    speaker_6 = models.ForeignKey(contributors, on_delete=models.CASCADE, related_name="speaker_6", null=True)
 
     def __str__(self):
-        return str(self.date)
+        return str(self.week)
     
 class steward(models.Model):
     week = models.ForeignKey(week, on_delete=models.CASCADE)
diff --git a/main/templates/main/index.html b/main/templates/main/index.html
index 388f01e..a5ce052 100644
--- a/main/templates/main/index.html
+++ b/main/templates/main/index.html
@@ -99,21 +99,21 @@
         <tr>
             <td style="width: 2.750rem;"><div class="infobox starttime s">1. Dienst</div></td>
             <td>
-                <input type="date" name="smd_1" id="smd_1" min="{{ date_area.min }}" max="{{ date_area.max }}">
-                <input type="time" name="smt_1" id="smt_1">
+                <input type="date" name="smd_1" id="smd_1" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_1|date:"Y-m-d"|default_if_none:"" }}">
+                <input type="time" name="smt_1" id="smt_1" value="{{ service_data.time_1|time:"H:i"|default_if_none:"" }}">
             </td>
             <td>
                 <select name="smm_1" id="smm_1">
                     <option value="0"></option>
-                    <option value="1">Zoom</option>
-                    <option value="2">Saal</option>
+                    <option value="1"{% if service_data.type_1 == 1 %}selected{% endif %}>Zoom</option>
+                    <option value="2"{% if service_data.type_1 == 2 %}selected{% endif %}>Saal</option>
                 </select>
             </td>
             <td>
                 <select name="sms_1" id="sms_1">
                     <option value="0"></option>
                     {% for i in sm %}
-                    <option value="{{ i.id }}">{{ i.first_name.0 }}. {{ i.name }}</option>
+                    <option value="{{ i.id }}"{% if service_data.speaker_1.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option>
                     {% endfor %}
                 </select>
             </td>
@@ -123,21 +123,21 @@
         <tr>
             <td style="width: 2.750rem;"><div class="infobox starttime s">2. Dienst</div></td>
             <td>
-                <input type="date" name="smd_2" id="smd_2" min="{{ date_area.min }}" max="{{ date_area.max }}">
-                <input type="time" name="smt_2" id="smt_2">
+                <input type="date" name="smd_2" id="smd_2" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_2|date:"Y-m-d"|default_if_none:"" }}">
+                <input type="time" name="smt_2" id="smt_2" value="{{ service_data.time_2|time:"H:i"|default_if_none:"" }}">
             </td>
             <td>
                 <select name="smm_2" id="smm_2">
                     <option value="0"></option>
-                    <option value="1">Zoom</option>
-                    <option value="2">Saal</option>
+                    <option value="1"{% if service_data.type_2 == 1 %}selected{% endif %}>Zoom</option>
+                    <option value="2"{% if service_data.type_2 == 2 %}selected{% endif %}>Saal</option>
                 </select>
             </td>
             <td>
                 <select name="sms_2" id="sms_2">
                     <option value="0"></option>
                     {% for i in sm %}
-                    <option value="{{ i.id }}">{{ i.first_name.0 }}. {{ i.name }}</option>
+                    <option value="{{ i.id }}"{% if service_data.speaker_2.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option>
                     {% endfor %}
                 </select>
             </td>
@@ -147,21 +147,21 @@
         <tr>
             <td style="width: 2.750rem;"><div class="infobox starttime s">3. Dienst</div></td>
             <td>
-                <input type="date" name="smd_3" id="smd_3" min="{{ date_area.min }}" max="{{ date_area.max }}">
-                <input type="time" name="smt_3" id="smt_3">
+                <input type="date" name="smd_3" id="smd_3" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_3|date:"Y-m-d"|default_if_none:"" }}">
+                <input type="time" name="smt_3" id="smt_3" value="{{ service_data.time_3|time:"H:i"|default_if_none:"" }}">
             </td>
             <td>
                 <select name="smm_3" id="smm_3">
                     <option value="0"></option>
-                    <option value="1">Zoom</option>
-                    <option value="2">Saal</option>
+                    <option value="1"{% if service_data.type_3 == 1 %}selected{% endif %}>Zoom</option>
+                    <option value="2"{% if service_data.type_3 == 2 %}selected{% endif %}>Saal</option>
                 </select>
             </td>
             <td>
                 <select name="sms_3" id="sms_3">
                     <option value="0"></option>
                     {% for i in sm %}
-                    <option value="{{ i.id }}">{{ i.first_name.0 }}. {{ i.name }}</option>
+                    <option value="{{ i.id }}"{% if service_data.speaker_3.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option>
                     {% endfor %}
                 </select>
             </td>
@@ -171,21 +171,21 @@
         <tr>
             <td style="width: 2.750rem;"><div class="infobox starttime s">4. Dienst</div></td>
             <td>
-                <input type="date" name="smd_4" id="smd_4" min="{{ date_area.min }}" max="{{ date_area.max }}">
-                <input type="time" name="smt_4" id="smt_4">
+                <input type="date" name="smd_4" id="smd_4" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_4|date:"Y-m-d"|default_if_none:"" }}">
+                <input type="time" name="smt_4" id="smt_4" value="{{ service_data.time_4|time:"H:i"|default_if_none:"" }}">
             </td>
             <td>
                 <select name="smm_4" id="smm_4">
                     <option value="0"></option>
-                    <option value="1">Zoom</option>
-                    <option value="2">Saal</option>
+                    <option value="1"{% if service_data.type_4 == 1 %}selected{% endif %}>Zoom</option>
+                    <option value="2"{% if service_data.type_4 == 2 %}selected{% endif %}>Saal</option>
                 </select>
             </td>
             <td>
                 <select name="sms_4" id="sms_4">
                     <option value="0"></option>
                     {% for i in sm %}
-                    <option value="{{ i.id }}">{{ i.first_name.0 }}. {{ i.name }}</option>
+                    <option value="{{ i.id }}"{% if service_data.speaker_4.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option>
                     {% endfor %}
                 </select>
             </td>
@@ -195,21 +195,21 @@
         <tr>
             <td style="width: 2.750rem;"><div class="infobox starttime s">5. Dienst</div></td>
             <td>
-                <input type="date" name="smd_5" id="smd_5" min="{{ date_area.min }}" max="{{ date_area.max }}">
-                <input type="time" name="smt_5" id="smt_5">
+                <input type="date" name="smd_5" id="smd_5" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_5|date:"Y-m-d"|default_if_none:"" }}">
+                <input type="time" name="smt_5" id="smt_5" value="{{ service_data.time_5|time:"H:i"|default_if_none:"" }}">
             </td>
             <td>
                 <select name="smm_5" id="smm_5">
                     <option value="0"></option>
-                    <option value="1">Zoom</option>
-                    <option value="2">Saal</option>
+                    <option value="1"{% if service_data.type_5 == 1 %}selected{% endif %}>Zoom</option>
+                    <option value="2"{% if service_data.type_5 == 2 %}selected{% endif %}>Saal</option>
                 </select>
             </td>
             <td>
                 <select name="sms_5" id="sms_5">
                     <option value="0"></option>
                     {% for i in sm %}
-                    <option value="{{ i.id }}">{{ i.first_name.0 }}. {{ i.name }}</option>
+                    <option value="{{ i.id }}"{% if service_data.speaker_5.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option>
                     {% endfor %}
                 </select>
             </td>
@@ -219,21 +219,21 @@
         <tr>
             <td style="width: 2.750rem;"><div class="infobox starttime s">6. Dienst</div></td>
             <td>
-                <input type="date" name="smd_6" id="smd_6" min="{{ date_area.min }}" max="{{ date_area.max }}">
-                <input type="time" name="smt_6" id="smt_6">
+                <input type="date" name="smd_6" id="smd_6" min="{{ date_area.min }}" max="{{ date_area.max }}" value="{{ service_data.date_6|date:"Y-m-d"|default_if_none:"" }}">
+                <input type="time" name="smt_6" id="smt_6" value="{{ service_data.time_6|time:"H:i"|default_if_none:"" }}">
             </td>
             <td>
                 <select name="smm_6" id="smm_6">
                     <option value="0"></option>
-                    <option value="1">Zoom</option>
-                    <option value="2">Saal</option>
+                    <option value="1"{% if service_data.type_6 == 1 %}selected{% endif %}>Zoom</option>
+                    <option value="2"{% if service_data.type_6 == 2 %}selected{% endif %}>Saal</option>
                 </select>
             </td>
             <td>
                 <select name="sms_6" id="sms_6">
                     <option value="0"></option>
                     {% for i in sm %}
-                    <option value="{{ i.id }}">{{ i.first_name.0 }}. {{ i.name }}</option>
+                    <option value="{{ i.id }}"{% if service_data.speaker_6.id == i.id %}selected{% endif %}>{{ i.first_name.0 }}. {{ i.name }}</option>
                     {% endfor %}
                 </select>
             </td>
diff --git a/main/views.py b/main/views.py
index 721dfcd..eb2a095 100644
--- a/main/views.py
+++ b/main/views.py
@@ -56,6 +56,7 @@ def index(request):
     info_data = MainModel.info.objects.filter(week__date_of_monday=strDate)[0]
     gruppen_data = MainModel.group.objects.all()
     persons = MainModel.contributors.objects.all()
+    service_data = MainModel.service.objects.filter(week__date_of_monday=strDate)[0]
 
     return render(request, 'main/index.html', {'actual' : actual, 
                                                'error' : error, 
@@ -75,6 +76,7 @@ def index(request):
                                                 'steward_data' : steward_data,
                                                 'regie_data' : regie_data,
                                                 'info_data' : info_data,
-                                                'gruppen_data' : gruppen_data
+                                                'gruppen_data' : gruppen_data,
+                                                'service_data' : service_data
                                                })