diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html
index 7910234..821a305 100644
--- a/src/app/task-table/task-table.component.html
+++ b/src/app/task-table/task-table.component.html
@@ -22,7 +22,7 @@
                     <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 *ngIf="sortDescending === false && sortBy === 'title'"><i class="fa fa-sort-down fa-lg"></i></span>
                     </span>
                 </th>
                 <th (click)="sortByTitle()" class="sortable">
@@ -51,11 +51,12 @@
                 </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>
                         <span (click)="sortByPrio()">
diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html
index 5c063d4..0a0242a 100644
--- a/src/app/userstory-table/userstory-table.component.html
+++ b/src/app/userstory-table/userstory-table.component.html
@@ -42,18 +42,21 @@
       </th>
       <th class="sortable">
         <div class="d-inline-block">
-          <div ngbDropdown class="d-inline-block">
-              <span id="dropdownBasic1" ngbDropdownToggle>Priotität</span>
-              <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-                  <option (click)="filterPriority=null">All</option>
-                  <option *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 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">