diff --git a/src/app/sprint-table/sprint-table.component.css b/src/app/sprint-table/sprint-table.component.css
index 5b74f7f..70c4c49 100644
--- a/src/app/sprint-table/sprint-table.component.css
+++ b/src/app/sprint-table/sprint-table.component.css
@@ -1,8 +1,3 @@
-table {
-    table-layout: fixed;
-  }
-  
-  th.sortable:hover {
+th.sortable:hover {
     text-decoration: underline;
-  }
-  
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/app/sprint-table/sprint-table.component.html b/src/app/sprint-table/sprint-table.component.html
index e824be9..894bcb9 100644
--- a/src/app/sprint-table/sprint-table.component.html
+++ b/src/app/sprint-table/sprint-table.component.html
@@ -1,40 +1,44 @@
-<div class="mx-5 my-3">
+<div class="container-fluid">
 
-    <h3 class="my-1">
+    <h3>
       Sprints
     </h3>
   
-    <button class="btn btn-secondary my-3" (click)="openSprintForm()">Neuer Sprint</button>
+    <button class="btn btn-secondary" (click)="openSprintForm()">Neuer Sprint</button>
     <table class="table">
       <thead>
       <tr>
         <th (click)="sortById()" class="sortable">
           <span>ID</span>
-          <span *ngIf="sortBy === 'id'" class="pl-3">
-            <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-            <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-          </span>
+          <span>
+            <span *ngIf="sortBy != 'id'"><i class="fa fa-sort fa-lg"></i></span>
+            <span *ngIf="sortDescending && sortBy === 'id'"><i class="fa fa-sort-up fa-lg"></i></span>
+            <span *ngIf="sortDescending === false && sortBy === 'id'"><i class="fa fa-sort-down fa-lg"></i></span>
+        </span>
         </th>
         <th (click)="sortByTitle()" class="sortable">
           <span>Titel</span>
-          <span *ngIf="sortBy === 'title'" class="pl-3">
-            <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-            <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-          </span>
+          <span>
+            <span *ngIf="sortBy != 'title'"><i class="fa fa-sort fa-lg"></i></span>
+            <span *ngIf="sortDescending && sortBy === 'title'"><i class="fa fa-sort-up fa-lg"></i></span>
+            <span *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
+        </span>
         </th>
         <th (click)="sortByStartDate()" class="sortable">
             <span>Start</span>
-            <span *ngIf="sortBy === 'startDate'" class="pl-3">
-              <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-              <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-            </span>
+            <span>
+              <span *ngIf="sortBy != 'startDate'"><i class="fa fa-sort fa-lg"></i></span>
+              <span *ngIf="sortDescending && sortBy === 'startDate'"><i class="fa fa-sort-up fa-lg"></i></span>
+              <span *ngIf="sortDescending === false && sortBy === 'startDate'"><i class="fa fa-sort-down fa-lg"></i></span>
+          </span>
           </th>
-          <th (click)="sortByEndDate()" class="endDate">
+          <th (click)="sortByEndDate()" class="sortable">
             <span>End</span>
-            <span *ngIf="sortBy === 'endDate'" class="pl-3">
-              <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-              <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-            </span>
+            <span>
+              <span *ngIf="sortBy != 'endDate'"><i class="fa fa-sort fa-lg"></i></span>
+              <span *ngIf="sortDescending && sortBy === 'endDate'"><i class="fa fa-sort-up fa-lg"></i></span>
+              <span *ngIf="sortDescending === false && sortBy === 'endDate'"><i class="fa fa-sort-down fa-lg"></i></span>
+          </span>
           </th>
         <th></th>
       </tr>
diff --git a/src/app/task-table/task-table.component.css b/src/app/task-table/task-table.component.css
index a7c065c..70f7a6e 100644
--- a/src/app/task-table/task-table.component.css
+++ b/src/app/task-table/task-table.component.css
@@ -1,7 +1,3 @@
-table {
-  table-layout: fixed;
-}
-
 th.sortable:hover {
   text-decoration: underline;
 }
diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html
index 68019f9..1a8b2f2 100644
--- a/src/app/task-table/task-table.component.html
+++ b/src/app/task-table/task-table.component.html
@@ -1,6 +1,6 @@
-<div class="mx-5 my-3">
+<div class="container-fluid">
 
-    <h3 class="my-1">
+    <h3>
         <a *ngIf="filterUserstoryId" [routerLink]="['/userstories', {id: filterUserstoryId}]">
             Userstory #{{filterUserstoryId}}
             &gt;
@@ -11,70 +11,74 @@
         <a [routerLink]="'/tasks'">Alle Tasks anzeigen</a>
     </div>
 
-    <button class="btn btn-secondary my-3" (click)="openTaskForm()">Neuer Task</button>
+    <button class="btn btn-secondary" (click)="openTaskForm()">Neuer Task</button>
 
     <table class="table">
-
         <thead>
             <tr>
                 <th (click)="sortById()" class="sortable">
                     <span>ID</span>
-                    <span *ngIf="sortBy === 'id'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'id'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'id'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByTitle()" class="sortable">
                     <span>Titel</span>
-                    <span *ngIf="sortBy === 'title'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'title'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'title'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByTasks()" class="sortable">
                     <span>Userstory</span>
-                    <span *ngIf="sortBy === 'userstory'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'userstory'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'userstory'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'userstory'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByStatus()" class="sortable">
                     <span>Status</span>
-                    <span *ngIf="sortBy === 'statusid'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'statusid'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'statusid'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'statusid'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th class="sortable">
                     <div class="d-inline-block">
+                        <span (click)="sortByPrio()">Priorität: </span>
                         <div ngbDropdown class="d-inline-block">
-                            <span id="dropdownBasic1" ngbDropdownToggle>Priotität</span>
+                            <span id="dropdownBasic1" ngbDropdownToggle>{{filterPriority || "All"}}</span>
                             <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-                                <option (click)="filterPriority=null">All</option>
-                                <option *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
+                                <option ngbDropdownItem (click)="filterPriority=null">All</option>
+                                <option ngbDropdownItem *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
                             </div>
                         </div>
-                        <div (click)="sortByPrio()">
-                            <i class="fa fa-sort"></i>
-                            <span *ngIf="sortBy === 'priority'" (click)="sortByPrio()" class="pl-3">
-                                <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                                <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-                            </span>
-                        </div>
+                        <span (click)="sortByPrio()">
+                                <span *ngIf="sortBy != 'priority'"><i class="fa fa-sort fa-lg"></i></span>
+                                <span *ngIf="sortDescending && sortBy === 'priority'"><i class="fa fa-sort-up fa-lg"></i></span>
+                                <span *ngIf="sortDescending === false && sortBy === 'priority'"><i class="fa fa-sort-down fa-lg"></i></span>
+                        </span>
                     </div>
                 </th>
                 <th (click)="sortByAssigned()" class="sortable">
                     <span>Assigned To</span>
-                    <span *ngIf="sortBy === 'assignedtoid'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'assignedtoid'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'assignedtoid'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'assignedtoid'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByCategory()" class="sortable">
                     <span>Category</span>
-                    <span *ngIf="sortBy === 'categoryid'" class="pl-3">
-                        <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-                        <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
+                    <span>
+                        <span *ngIf="sortBy != 'categoryid'"><i class="fa fa-sort fa-lg"></i></span>
+                        <span *ngIf="sortDescending && sortBy === 'categoryid'"><i class="fa fa-sort-up fa-lg"></i></span>
+                        <span *ngIf="sortDescending === false && sortBy === 'categoryid'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th></th>
diff --git a/src/app/userstory-table/userstory-table.component.css b/src/app/userstory-table/userstory-table.component.css
index a7c065c..70f7a6e 100644
--- a/src/app/userstory-table/userstory-table.component.css
+++ b/src/app/userstory-table/userstory-table.component.css
@@ -1,7 +1,3 @@
-table {
-  table-layout: fixed;
-}
-
 th.sortable:hover {
   text-decoration: underline;
 }
diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html
index d06db1c..90e0ce0 100644
--- a/src/app/userstory-table/userstory-table.component.html
+++ b/src/app/userstory-table/userstory-table.component.html
@@ -1,8 +1,8 @@
-<div class="mx-5 my-3">
+<div class="container-fluid">
 
-  <h3 class="my-1">Userstories</h3>
+  <h3>Userstories</h3>
 
-  <button class="btn btn-secondary my-3" (click)="openUserstoryForm()">Neue Userstory</button>
+  <button class="btn btn-secondary" (click)="openUserstoryForm()">Neue Userstory</button>
 
   <table class="table">
 
@@ -10,51 +10,62 @@
     <tr>
       <th (click)="sortById()" class="sortable">
         <span>ID</span>
-        <span *ngIf="sortBy === 'id'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+        <span>
+          <span *ngIf="sortBy != 'id'"><i class="fa fa-sort fa-lg"></i></span>
+          <span *ngIf="sortDescending && sortBy === 'id'"><i class="fa fa-sort-up fa-lg"></i></span>
+          <span *ngIf="sortDescending === false && sortBy === 'id'"><i class="fa fa-sort-down fa-lg"></i></span>
+      </span>
       </th>
       <th (click)="sortByTitle()" class="sortable">
         <span>Titel</span>
-        <span *ngIf="sortBy === 'title'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+        <span>
+          <span *ngIf="sortBy != 'title'"><i class="fa fa-sort fa-lg"></i></span>
+          <span *ngIf="sortDescending && sortBy === 'title'"><i class="fa fa-sort-up fa-lg"></i></span>
+          <span *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
+      </span>
       </th>
       <th (click)="sortByTasks()" class="sortable">
         <span>Tasks</span>
-        <span *ngIf="sortBy === 'tasks'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+        <span>
+          <span *ngIf="sortBy != 'tasks'"><i class="fa fa-sort fa-lg"></i></span>
+          <span *ngIf="sortDescending && sortBy === 'tasks'"><i class="fa fa-sort-up fa-lg"></i></span>
+          <span *ngIf="sortDescending === false && sortBy === 'tasks'"><i class="fa fa-sort-down fa-lg"></i></span>
+      </span>
       </th>
       <th (click)="sortByStatus()" class="sortable">
         <span>Status</span>
-        <span *ngIf="sortBy === 'statusid'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+        <span>
+          <span *ngIf="sortBy != 'statusid'"><i class="fa fa-sort fa-lg"></i></span>
+          <span *ngIf="sortDescending && sortBy === 'statusid'"><i class="fa fa-sort-up fa-lg"></i></span>
+          <span *ngIf="sortDescending === false && sortBy === 'statusid'"><i class="fa fa-sort-down fa-lg"></i></span>
+      </span>
       </th>
-      <th (click)="sortByPrio()" class="sortable">
-        <span>Priorität</span>
-        <label class="pl-3" (click)="$event.stopPropagation()">
-          <select [(ngModel)]="filterPriority">
-            <option [ngValue]="null" selected></option>
-            <option *ngFor="let p of getAllPriorities()" [ngValue]="p">{{p}}</option>
-          </select>
-        </label>
-        <span *ngIf="sortBy === 'priority'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+      <th class="sortable">
+        <div class="d-inline-block">
+          <div class="d-inline-block">
+            <span (click)="sortByPrio()">Priorität: </span>
+            <div ngbDropdown class="d-inline-block">
+                <span id="dropdownBasic1" ngbDropdownToggle>{{filterPriority || "All"}}</span>
+                <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
+                    <option ngbDropdownItem (click)="filterPriority=null">All</option>
+                    <option ngbDropdownItem *ngFor="let p of getAllPriorities()" (click)="filterPriority=p">{{p}}</option>
+                </div>
+            </div>
+            <span (click)="sortByPrio()">
+                    <span *ngIf="sortBy != 'priority'"><i class="fa fa-sort fa-lg"></i></span>
+                    <span *ngIf="sortDescending && sortBy === 'priority'"><i class="fa fa-sort-up fa-lg"></i></span>
+                    <span *ngIf="sortDescending === false && sortBy === 'priority'"><i class="fa fa-sort-down fa-lg"></i></span>
+            </span>
+        </div>
+      </div>
       </th>
       <th (click)="sortByCategory()" class="sortable">
         <span>Category</span>
-        <span *ngIf="sortBy === 'categoryid'" class="pl-3">
-          <span *ngIf="sortDescending"><i class="fa fa-sort-up"></i></span>
-          <span *ngIf="sortDescending === false"><i class="fa fa-sort-down"></i></span>
-        </span>
+        <span>
+          <span *ngIf="sortBy != 'categoryid'"><i class="fa fa-sort fa-lg"></i></span>
+          <span *ngIf="sortDescending && sortBy === 'categoryid'"><i class="fa fa-sort-up fa-lg"></i></span>
+          <span *ngIf="sortDescending === false && sortBy === 'categoryid'"><i class="fa fa-sort-down fa-lg"></i></span>
+      </span>
       </th>
       <th></th>
     </tr>