diff --git a/demo-shell/src/app/components/app-layout/cloud/processes-cloud-demo.component.html b/demo-shell/src/app/components/app-layout/cloud/processes-cloud-demo.component.html
index 6f31a6a396..55a46b99b2 100644
--- a/demo-shell/src/app/components/app-layout/cloud/processes-cloud-demo.component.html
+++ b/demo-shell/src/app/components/app-layout/cloud/processes-cloud-demo.component.html
@@ -7,20 +7,22 @@
         (action)="onProcessFilterAction($event)">
     </adf-cloud-edit-process-filter>
     <div fxLayout="column" fxFlex fxLayoutAlign="space-between" *ngIf="editedFilter">
-        <adf-cloud-process-list fxFlex class="adf-cloud-layout-overflow"
-                                [applicationName]="editedFilter.appName"
-                                [initiator]="editedFilter.initiator"
-                                [processDefinitionId]="editedFilter.processDefinitionId"
-                                [processDefinitionKey]="editedFilter.processDefinitionKey"
-                                [id]="editedFilter.processInstanceId"
-                                [status]="editedFilter.state"
-                                [name]="editedFilter.processName"
-                                [sorting]="sortArray"
-                                [selectionMode]="selectionMode"
-                                [multiselect]="multiselect"
-                                (rowClick)="onRowClick($event)"
-                                (rowsSelected)="onRowsSelected($event)"
-                                #processCloud>
+        <adf-cloud-process-list
+            fxFlex 
+            class="adf-cloud-layout-overflow"
+            [applicationName]="editedFilter.appName"
+            [initiator]="editedFilter.initiator"
+            [processDefinitionId]="editedFilter.processDefinitionId"
+            [processDefinitionKey]="editedFilter.processDefinitionKey"
+            [id]="editedFilter.processInstanceId"
+            [status]="editedFilter.state"
+            [name]="editedFilter.processName"
+            [sorting]="sortArray"
+            [selectionMode]="selectionMode"
+            [multiselect]="multiselect"
+            (rowClick)="onRowClick($event)"
+            (rowsSelected)="onRowsSelected($event)"
+            #processCloud>
         </adf-cloud-process-list>
         <adf-pagination 
             [target]="processCloud" 
diff --git a/demo-shell/src/app/components/app-layout/cloud/tasks-cloud-demo.component.html b/demo-shell/src/app/components/app-layout/cloud/tasks-cloud-demo.component.html
index 61914fc8c8..bbc849baef 100644
--- a/demo-shell/src/app/components/app-layout/cloud/tasks-cloud-demo.component.html
+++ b/demo-shell/src/app/components/app-layout/cloud/tasks-cloud-demo.component.html
@@ -7,7 +7,9 @@
         (filterChange)="onFilterChange($event)">
     </adf-cloud-edit-task-filter>
     <div fxLayout="column" fxFlex fxLayoutAlign="space-between" *ngIf="editedFilter">
-        <adf-cloud-task-list #taskCloud
+        <adf-cloud-task-list 
+            fxFlex
+            class="adf-cloud-layout-overflow"
             [applicationName]="editedFilter.appName"
             [processDefinitionId]="editedFilter.processDefinitionId"
             [processInstanceId]="editedFilter.processInstanceId"
@@ -23,12 +25,14 @@
             [multiselect]="multiselect"
             [selectionMode]="selectionMode"
             (rowClick)="onRowClick($event)"
-            (rowsSelected)="onRowsSelected($event)">
+            (rowsSelected)="onRowsSelected($event)"
+            #taskCloud>
         </adf-cloud-task-list>
-        <adf-pagination [target]="taskCloud"
-                        (changePageSize)="onChangePageSize($event)"
-                        (nextPage)="resetSelectedRows()"
-                        (prevPage)="resetSelectedRows()">
+        <adf-pagination 
+            [target]="taskCloud"
+            (changePageSize)="onChangePageSize($event)"
+            (nextPage)="resetSelectedRows()"
+            (prevPage)="resetSelectedRows()">
         </adf-pagination>
         <div *ngIf="testingMode">
             Selected rows: