diff --git a/demo-shell/src/app/components/process-service/process-service.component.html b/demo-shell/src/app/components/process-service/process-service.component.html
index c67d279ff4..7f645c83bd 100644
--- a/demo-shell/src/app/components/process-service/process-service.component.html
+++ b/demo-shell/src/app/components/process-service/process-service.component.html
@@ -38,6 +38,7 @@
                         [presetColumn]="presetColumn"
                         [page]="taskPage"
                         [size]="paginationPageSize"
+                        [selectionMode]="selectionMode"
                         [processDefinitionKey]="taskFilter?.filter?.processDefinitionKey"
                         [name]="taskFilter?.filter?.name"
                         [assignment]="taskFilter?.filter?.assignment"
@@ -146,6 +147,7 @@
                     <adf-process-instance-list
                         #processList
                         *ngIf="processFilter?.filter" [appId]="processFilter?.appId"
+                        [selectionMode]="selectionMode"
                         [processDefinitionKey]="processFilter?.filter?.processDefinitionKey"
                         [presetColumn]="presetColumn"
                         [state]="processFilter?.filter?.state"
@@ -251,20 +253,32 @@
             </div>
             <div class="adf-grid-item adf-settings-details" fxFlex.gt-md="1 1 auto">
                 <div>
-                    <mat-slide-toggle id="adf-show-task-filter-icon" (change)="changeTaskFilterIcon()" [checked]="showTaskFilterIcon">Show task filters icons</mat-slide-toggle>
+                    <mat-slide-toggle id="adf-show-task-filter-icon" [(ngModel)]="showTaskFilterIcon">Show task filters icons
+                    </mat-slide-toggle>
                 </div>
                 <div>
-                    <mat-slide-toggle id="adf-show-process-filter-icon" (change)="changeProcessFilterIcon()" [checked]="showProcessFilterIcon">Show process filters icons</mat-slide-toggle>
+                    <mat-slide-toggle id="adf-show-process-filter-icon" [(ngModel)]="showProcessFilterIcon">Show process filters icons
+                    </mat-slide-toggle>
                 </div>
                 <div>
-                    <mat-slide-toggle id="adf-show-header" (change)="toggleHeaderContent()" [checked]="showHeaderContent">{{ 'PS-TAB.TASK-SHOW-HEADER'| translate }}</mat-slide-toggle>
+                    <mat-slide-toggle id="adf-show-header" (change)="toggleHeaderContent()"
+                                      [checked]="showHeaderContent">{{ 'PS-TAB.TASK-SHOW-HEADER'| translate }}
+                    </mat-slide-toggle>
                 </div>
                 <div>
-                    <mat-slide-toggle id="adf-process-multiselect"  (change)="toggleTasProcesssMultiselect()" [checked]="multiSelectProcess">Multiselect Process List</mat-slide-toggle>
+                    <mat-slide-toggle id="adf-process-multiselect"  [(ngModel)]="multiSelectProcess" >Multiselect Process List
+                    </mat-slide-toggle>
                 </div>
                 <div>
-                    <mat-slide-toggle id="adf-task-multiselect"  (change)="toggleTaskMultiselect()" [checked]="multiSelectTask">Multiselect Task List</mat-slide-toggle>
+                    <mat-slide-toggle id="adf-task-multiselect" [(ngModel)]="multiSelectTask" >Multiselect Task List
+                    </mat-slide-toggle>
                 </div>
+                <br>
+                <mat-radio-group [(ngModel)]="selectionMode">
+                    <mat-radio-button value="multiple">multiple</mat-radio-button>
+                    <mat-radio-button value="single">single</mat-radio-button>
+                    <mat-radio-button value="none">none</mat-radio-button>
+                </mat-radio-group>
             </div>
         </div>
     </mat-tab>
diff --git a/demo-shell/src/app/components/process-service/process-service.component.ts b/demo-shell/src/app/components/process-service/process-service.component.ts
index 92d937c6e1..6c0bcc214c 100644
--- a/demo-shell/src/app/components/process-service/process-service.component.ts
+++ b/demo-shell/src/app/components/process-service/process-service.component.ts
@@ -120,6 +120,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
     selectFirstReport = false;
     multiSelectTask = false;
     multiSelectProcess = false;
+    selectionMode = 'single';
 
     private tabs = { tasks: 0, processes: 1, reports: 2 };
 
@@ -504,19 +505,4 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
         this.currentTaskId = null;
     }
 
-    changeTaskFilterIcon() {
-        this.showTaskFilterIcon = !this.showTaskFilterIcon;
-    }
-
-    changeProcessFilterIcon() {
-        this.showProcessFilterIcon = !this.showProcessFilterIcon;
-    }
-
-    toggleTasProcesssMultiselect() {
-        this.multiSelectProcess = !this.multiSelectProcess;
-    }
-
-    toggleTaskMultiselect() {
-        this.multiSelectTask = !this.multiSelectTask;
-    }
 }
diff --git a/lib/core/form/components/widgets/container/container.widget.scss b/lib/core/form/components/widgets/container/container.widget.scss
index 58466f7096..284d3aa666 100644
--- a/lib/core/form/components/widgets/container/container.widget.scss
+++ b/lib/core/form/components/widgets/container/container.widget.scss
@@ -63,7 +63,7 @@
         }
 
         .mat-form-field-label-wrapper {
-            top: 22px !important;
+            top: 22px;
         }
 
         .mat-input-placeholder {
diff --git a/lib/core/form/components/widgets/people/people.widget.scss b/lib/core/form/components/widgets/people/people.widget.scss
index 3d8946e6a3..9f23320597 100644
--- a/lib/core/form/components/widgets/people/people.widget.scss
+++ b/lib/core/form/components/widgets/people/people.widget.scss
@@ -7,6 +7,10 @@
 
         &-people-widget {
             width: 100%;
+
+            .mat-form-field-label-wrapper {
+                top: 10px;
+            }
         }
 
         &-people-widget-list {
diff --git a/lib/process-services/task-list/components/start-task.component.scss b/lib/process-services/task-list/components/start-task.component.scss
index 7c6d0281f8..c62a5ea745 100644
--- a/lib/process-services/task-list/components/start-task.component.scss
+++ b/lib/process-services/task-list/components/start-task.component.scss
@@ -16,6 +16,7 @@
     }
 
     .adf-new-task-layout-card {
+
         width: 66%;
         margin: 10px auto;
 
@@ -74,6 +75,14 @@
     }
 
     adf-start-task {
+
+        people-widget {
+            width: 100%;
+            .mat-form-field-label-wrapper {
+                top: -14px !important;
+            }
+        }
+
         .adf {
 
             &-new-task-footer {