diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
index e1abec3..4b01472 100644
--- a/src/app/task-form/task-form.component.html
+++ b/src/app/task-form/task-form.component.html
@@ -1,62 +1,69 @@
 <!-- <div class="modal-lg"> -->
-    <div class="modal-content p-3">
-        <div class="modal-header">
-            <h4 class="modal-title">Neuen Task anlegen</h4>
-            <h6 class="modal-caption">Userstory: </h6>
-            <button (click)="onClose()" type="button" class="close" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-        <div class="modal-body">
-            <form (ngSubmit)="onSubmit()">
+<div class="modal-content p-3">
+    <div class="modal-header">
+        <table>
+            <tr>
+                <h4 class="modal-title">Neuen Task anlegen</h4>
+            </tr>
+            <tr>
+                <h6 class="modal-caption text-muted"> Gehört zu Story: <a href="#"></a></h6>
+            </tr>
+            <!--getUserstory fehlt noch-->
+        </table>
+        <button (click)="onClose()" type="button" class="close" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
+    </div>
+    <div class="modal-body">
+        <form (ngSubmit)="onSubmit()">
 
-                <div class="row">
-                    <div class="col-md-9">
-                        <div class="form-group">
-                            <label for="Title">Titel</label>
-                            <input type="text" class="form-control" id="Title" required name="title"
-                                [(ngModel)]="task.title">
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label for="Prio">Prio</label>
-                            <select class="form-control" id="prio" required name="prio"
-                                [(ngModel)]="task.priority">
-                                <option value="low">Low</option>
-                                <option value="medium">Medium</option>
-                                <option value="high">High</option>
-                            </select>
-                        </div>
+            <div class="row">
+                <div class="col-md-9">
+                    <div class="form-group">
+                        <label for="Title">Titel</label>
+                        <input type="text" class="form-control" id="Title" required name="title"
+                            [(ngModel)]="task.title">
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-md-9">
-                        <div class="form-group">
-                            <label for="Inhalt">What to do?</label>
-                            <textarea type="text" class="form-control" id="Story" required name="story" rows="5"
-                                [(ngModel)]="task.content"></textarea>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="form-group">
-                            <label for="Inhalt">Status</label>
-                            <input type="text" class="form-control" id="Status" required name="status"
-                                [(ngModel)]="task.status">
-                        </div>
-                        <div class="form-group">
-                            <label for="Inhalt">Assigned User</label>
-                            <input type="text" class="form-control" id="Author" required name="author"
-                                >
-                        </div>
+                <div class="col-md-1"></div>
+                <div class="col-md-2">
+                    <div class="form-group">
+                        <label for="Prio">Prio</label>
+                        <select class="form-control custom-select mr-sm-2" id="prio" required name="prio"
+                            [(ngModel)]="task.priority">
+                            <option value="low">Low</option>
+                            <option value="medium">Medium</option>
+                            <option value="high">High</option>
+                        </select>
                     </div>
                 </div>
-            </form>
-            <div class="modal-footer">
-                <button (click)="onClose()" type="dismiss" class="btn btn-secondary"
-                    data-dismiss="modal">Abbrechen</button>
-                <button type="submit" class="btn btn-primary">Erstellen</button>
             </div>
+            <div class="row">
+                <div class="col-md-9">
+                    <div class="form-group">
+                        <label for="Inhalt">What to do?</label>
+                        <textarea type="text" class="form-control" id="Story" required name="story" rows="5"
+                            [(ngModel)]="task.content"></textarea>
+                    </div>
+                </div>
+                <div class="col-md-1"></div>
+                <div class="col-md-2">
+                    <div class="form-group">
+                        <label for="Inhalt">Status</label>
+                        <input type="text" class="form-control" id="Status" required name="status"
+                            [(ngModel)]="task.status">
+                    </div>
+                    <div class="form-group">
+                        <label for="Inhalt">Assigned User</label>
+                        <input type="text" class="form-control" id="Author" required name="author">
+                    </div>
+                </div>
+            </div>
+        </form>
+        <div class="modal-footer">
+            <button (click)="onClose()" type="dismiss" class="btn btn-secondary" data-dismiss="modal">Abbrechen</button>
+            <button type="submit" class="btn btn-primary">Erstellen</button>
         </div>
     </div>
+</div>
 <!-- </div> -->
\ No newline at end of file
diff --git a/src/app/userstory-form/userstory-form.component.html b/src/app/userstory-form/userstory-form.component.html
index 4773281..7701d59 100644
--- a/src/app/userstory-form/userstory-form.component.html
+++ b/src/app/userstory-form/userstory-form.component.html
@@ -1,5 +1,5 @@
 <!-- <div class="modal-lg"> -->
-    <div class="modal-content p-3">
+    <div class="modal-content p-3 text-dark">
         <div class="modal-header">
             <h4 class="modal-title">Neue Userstory anlegen</h4>
             <button (click)="onClose()" type="button" class="close" aria-label="Close">
@@ -17,10 +17,11 @@
                                 [(ngModel)]="userstory.title">
                         </div>
                     </div>
+                    <div class="col-md-1"></div>
                     <div class="col-md-2">
                         <div class="form-group">
                             <label for="Prio">Prio</label>
-                            <select class="form-control" id="prio" required name="prio"
+                            <select class="custom-select mr-sm-2" id="prio" required name="prio"
                                 [(ngModel)]="userstory.priority">
                                 <option value="low">Low</option>
                                 <option value="medium">Medium</option>
@@ -36,7 +37,9 @@
                             <textarea type="text" class="form-control" id="Story" required name="story" rows="5"
                                 [(ngModel)]="userstory.content"></textarea>
                         </div>
+
                     </div>
+                    <div class="col-md-1"></div>
                     <div class="col-md-2">
                         <div class="form-group">
                             <label for="Inhalt">Status</label>