diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
index 5463e85..601535d 100644
--- a/src/app/task-form/task-form.component.html
+++ b/src/app/task-form/task-form.component.html
@@ -1,10 +1,14 @@
-<div class="card" style="width: 100%;">
+<div class="card" style="width: 100%;">    
     <div class="container">
     <div class="card-body">
-        <div class="col-8">
+        <div style="text-align: right;">
+            <i class="fa fa-times fa-lg" (click)="onClose()"></i>
+    </div>
+        <div class="row">
+        <div class="col-8" style="text-align: left;">
                 <h4 class="card-title">Neuen Task anlegen</h4>
-                <div ngbDropdown class="dropdown">
-                    <span ngbDropdownToggle class="dropdown-toggle" id="dropdownMenuUserstory" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <div ngbDropdown class="dropdown card-text">
+                    <span ngbDropdownToggle class="dropdown" id="dropdownMenuUserstory" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         Gehört zu Story: {{getUserstoryTitleById(task.userstoryid) || "Keine"}}
                         <i class="fa fa-caret-down"></i>
                     </span>
@@ -12,10 +16,9 @@
                         <option ngbDropdownItem *ngFor="let userstory of userstories" (click)="task.userstoryid = userstory.id">{{ userstory.title }}</option>
                     </div>
                 </div>
+    </div>
+    <div class="col-4"></div>
         </div>
-        <button (click)="onClose()" type="button" class="close" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-        </button>    
         <form (ngSubmit)="onSubmit()">
             <div class="row">
             <div class="col-8">
@@ -43,12 +46,12 @@
                               Status: {{task.statusid}}
                             </button>
                             <div ngbDropdownMenu class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                                <label for="Inhalt">Status wählen</label>
+                                <div class="card-text" for="Inhalt">Status wählen</div>
                                 <option disable-auto-close ngbDropdownItem *ngFor="let status of allStatus" (click)="task.statusid = status.id">{{ status.title }}</option>
                             
                             <div class="dropdown-divider"></div>
-                            <label for="Inhalt">Neuer Status</label>
-                            <input #statusname type="text" id="statusname" class="form-control" (change)="status.title=statusname.value">
+                            <div class="card-text" for="Inhalt">Neuer Status</div>
+                            <input #statusname type="text" id="statusname" class="dropdown-item" (change)="status.title=statusname.value" placeholder="New Title..." style="background-color: rgba(211, 211, 211, 0.342);">
                             <button disable-auto-close ngbDropdownItem class="dropdown-item" type="button"  (click)="createTaskStatus(status)">Status anlegen</button>
                             <button disable-auto-close ngbDropdownItem class="dropdown-item" type="button" (click)="deleteStatus(task.statusid)">Status löschen</button>
                             </div>
diff --git a/src/app/task-table/task-table.component.ts b/src/app/task-table/task-table.component.ts
index 66e49fe..54163ef 100644
--- a/src/app/task-table/task-table.component.ts
+++ b/src/app/task-table/task-table.component.ts
@@ -11,6 +11,7 @@ import { TaskFormComponent } from '../task-form/task-form.component';
 import { TableComponentBase } from '../services/table-component.base';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { getNumberForPriority } from '../services/sorting.service';
+import { NONE_TYPE } from '@angular/compiler';
 
 @Component({
   selector: 'app-userstory-table',