diff --git a/client/web/admin/src/views/Automation/Permissions/Index.vue b/client/web/admin/src/views/Automation/Permissions/Index.vue
index d7ce4dfa2..51100e701 100644
--- a/client/web/admin/src/views/Automation/Permissions/Index.vue
+++ b/client/web/admin/src/views/Automation/Permissions/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     fluid
-    class="d-flex flex-column h-100 py-3"
+    class="d-flex flex-column h-100 pt-2 pb-3"
   >
     <c-content-header
       :title="$t('ui.title.automation')"
diff --git a/client/web/admin/src/views/Automation/Scripts/Index.vue b/client/web/admin/src/views/Automation/Scripts/Index.vue
index 9a75a79d2..84413ef7b 100644
--- a/client/web/admin/src/views/Automation/Scripts/Index.vue
+++ b/client/web/admin/src/views/Automation/Scripts/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     fluid="xl"
-    class="d-flex flex-column h-100 py-3"
+    class="d-flex flex-column h-100 pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
diff --git a/client/web/admin/src/views/Automation/Session/Editor.vue b/client/web/admin/src/views/Automation/Session/Editor.vue
index f01f2b8f7..b5f93e8a9 100644
--- a/client/web/admin/src/views/Automation/Session/Editor.vue
+++ b/client/web/admin/src/views/Automation/Session/Editor.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="$t('title')"
diff --git a/client/web/admin/src/views/Automation/Session/List.vue b/client/web/admin/src/views/Automation/Session/List.vue
index 207e7f352..35b59a1ee 100644
--- a/client/web/admin/src/views/Automation/Session/List.vue
+++ b/client/web/admin/src/views/Automation/Session/List.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     fluid="xl"
-    class="d-flex flex-column h-100 py-3"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -28,7 +28,7 @@
       sticky-header
       hide-search
       :hide-total="!pagination.incTotal"
-      class="custom-resource-list-height-no-buttons"
+      class="custom-resource-list-height flex-fill"
       @row-clicked="handleRowClicked"
     >
       <template #header>
diff --git a/client/web/admin/src/views/Automation/Workflow/Editor.vue b/client/web/admin/src/views/Automation/Workflow/Editor.vue
index b18b54099..de10e99dd 100644
--- a/client/web/admin/src/views/Automation/Workflow/Editor.vue
+++ b/client/web/admin/src/views/Automation/Workflow/Editor.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     v-if="workflow"
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="title"
diff --git a/client/web/admin/src/views/Automation/Workflow/List.vue b/client/web/admin/src/views/Automation/Workflow/List.vue
index ddf718e27..d958648ca 100644
--- a/client/web/admin/src/views/Automation/Workflow/List.vue
+++ b/client/web/admin/src/views/Automation/Workflow/List.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
     fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -26,7 +27,7 @@
       }"
       clickable
       sticky-header
-      class="custom-resource-list-height"
+      class="custom-resource-list-height flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >
diff --git a/client/web/admin/src/views/Compose/Permissions/Index.vue b/client/web/admin/src/views/Compose/Permissions/Index.vue
index 91a77c5c0..63f6ed9f8 100644
--- a/client/web/admin/src/views/Compose/Permissions/Index.vue
+++ b/client/web/admin/src/views/Compose/Permissions/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     fluid
-    class="d-flex flex-column h-100 py-3"
+    class="d-flex flex-column h-100 pt-2 pb-3"
   >
     <c-content-header
       :title="$t('ui.title.compose')"
diff --git a/client/web/admin/src/views/Compose/Settings/Index.vue b/client/web/admin/src/views/Compose/Settings/Index.vue
index 68d84c5f7..92ca43e7a 100644
--- a/client/web/admin/src/views/Compose/Settings/Index.vue
+++ b/client/web/admin/src/views/Compose/Settings/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="$t('title')"
diff --git a/client/web/admin/src/views/Dashboard.vue b/client/web/admin/src/views/Dashboard.vue
index 0d0be5dfa..9b36b307b 100644
--- a/client/web/admin/src/views/Dashboard.vue
+++ b/client/web/admin/src/views/Dashboard.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container
-    class="d-flex flex-column py-3 flex-fill"
+    class="d-flex flex-column pt-2 pb-3 flex-fill"
   >
     <c-content-header
       :title="$t('title')"
@@ -9,7 +9,6 @@
         ui-page="dashboard"
         ui-slot="toolbar"
         resource-type="system'"
-        class="mr-1"
         @click="dispatchCortezaSystemEvent($event)"
       />
     </c-content-header>
diff --git a/client/web/admin/src/views/Federation/Nodes/Editor.vue b/client/web/admin/src/views/Federation/Nodes/Editor.vue
index bb29a44be..396407e4e 100644
--- a/client/web/admin/src/views/Federation/Nodes/Editor.vue
+++ b/client/web/admin/src/views/Federation/Nodes/Editor.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="title"
diff --git a/client/web/admin/src/views/Federation/Nodes/List.vue b/client/web/admin/src/views/Federation/Nodes/List.vue
index 32d823d2a..f1ac4345e 100644
--- a/client/web/admin/src/views/Federation/Nodes/List.vue
+++ b/client/web/admin/src/views/Federation/Nodes/List.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
     fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -24,7 +25,7 @@
       clickable
       sticky-header
       hide-total
-      class="custom-resource-list-height"
+      class="custom-resource-list-height flex-fill"
       @row-clicked="handleRowClicked"
       @search="filterList"
     >
diff --git a/client/web/admin/src/views/Federation/Permissions/Index.vue b/client/web/admin/src/views/Federation/Permissions/Index.vue
index f4153a2f9..322283c1e 100644
--- a/client/web/admin/src/views/Federation/Permissions/Index.vue
+++ b/client/web/admin/src/views/Federation/Permissions/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     fluid
-    class="d-flex flex-column h-100 py-3"
+    class="d-flex flex-column h-100 pt-2 pb-3"
   >
     <c-content-header
       :title="$t('ui.title.federation')"
diff --git a/client/web/admin/src/views/Layout.vue b/client/web/admin/src/views/Layout.vue
index 0a9fcfbcd..8b1ac9ed2 100644
--- a/client/web/admin/src/views/Layout.vue
+++ b/client/web/admin/src/views/Layout.vue
@@ -70,7 +70,7 @@
           }"
         />
       </template>
-      <div class="d-flex flex-column w-100">
+      <div class="d-flex flex-column w-100 flex-fill">
         <router-view />
       </div>
     </main>
diff --git a/client/web/admin/src/views/System/Actionlog/Index.vue b/client/web/admin/src/views/System/Actionlog/Index.vue
index 16e921d05..75cd0246b 100644
--- a/client/web/admin/src/views/System/Actionlog/Index.vue
+++ b/client/web/admin/src/views/System/Actionlog/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     fluid="xl"
-    class="d-flex flex-column h-100 py-3"
+    class="d-flex flex-column h-100 pt-2 pb-3"
   >
     <c-content-header
       :title="$t('title')"
diff --git a/client/web/admin/src/views/System/Apigw/Editor.vue b/client/web/admin/src/views/System/Apigw/Editor.vue
index 9e454e94c..f75fd6b57 100644
--- a/client/web/admin/src/views/System/Apigw/Editor.vue
+++ b/client/web/admin/src/views/System/Apigw/Editor.vue
@@ -1,5 +1,5 @@
 <template>
-  <b-container class="py-3">
+  <b-container class="pt-2 pb-3">
     <c-content-header
       :title="$t('title')"
       class="mb-2"
diff --git a/client/web/admin/src/views/System/Apigw/Index.vue b/client/web/admin/src/views/System/Apigw/Index.vue
index eb9f9191a..18ca21672 100644
--- a/client/web/admin/src/views/System/Apigw/Index.vue
+++ b/client/web/admin/src/views/System/Apigw/Index.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
-    class="py-3"
+    fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -16,7 +17,7 @@
       />
 
       <c-route-list
-        class="mb-4 flex-fill"
+        class="flex-fill"
       />
     </div>
   </b-container>
diff --git a/client/web/admin/src/views/System/Apigw/Profiler/Hit.vue b/client/web/admin/src/views/System/Apigw/Profiler/Hit.vue
index 56f7dba34..38e0c69ba 100644
--- a/client/web/admin/src/views/System/Apigw/Profiler/Hit.vue
+++ b/client/web/admin/src/views/System/Apigw/Profiler/Hit.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="$t('hit.title')"
diff --git a/client/web/admin/src/views/System/Apigw/Profiler/Index.vue b/client/web/admin/src/views/System/Apigw/Profiler/Index.vue
index a53e6e232..7ccfc6397 100644
--- a/client/web/admin/src/views/System/Apigw/Profiler/Index.vue
+++ b/client/web/admin/src/views/System/Apigw/Profiler/Index.vue
@@ -1,7 +1,8 @@
 <template>
   <b-container
     data-tets-id="profiler"
-    class="py-3"
+    fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header
       :title="$t('title')"
@@ -10,7 +11,7 @@
     <b-card
       no-body
       data-test-id="card-profiler"
-      class="shadow-sm"
+      class="flex-fill shadow-sm"
       footer-class="d-flex align-items-center justify-content-center"
       footer-bg-variant="white"
       header-bg-variant="white"
diff --git a/client/web/admin/src/views/System/Apigw/Profiler/Route.vue b/client/web/admin/src/views/System/Apigw/Profiler/Route.vue
index fc4245764..911328fd9 100644
--- a/client/web/admin/src/views/System/Apigw/Profiler/Route.vue
+++ b/client/web/admin/src/views/System/Apigw/Profiler/Route.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="title"
diff --git a/client/web/admin/src/views/System/Application/Editor.vue b/client/web/admin/src/views/System/Application/Editor.vue
index 03e18b64a..7105a227d 100644
--- a/client/web/admin/src/views/System/Application/Editor.vue
+++ b/client/web/admin/src/views/System/Application/Editor.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     v-if="application"
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="title"
diff --git a/client/web/admin/src/views/System/Application/List.vue b/client/web/admin/src/views/System/Application/List.vue
index 468ddd1ce..fe99d2a9b 100644
--- a/client/web/admin/src/views/System/Application/List.vue
+++ b/client/web/admin/src/views/System/Application/List.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
     fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -26,7 +27,7 @@
       }"
       clickable
       sticky-header
-      class="custom-resource-list-height"
+      class="custom-resource-list-height flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >
diff --git a/client/web/admin/src/views/System/AuthClient/Editor.vue b/client/web/admin/src/views/System/AuthClient/Editor.vue
index c44a2b921..4a9ae32b7 100644
--- a/client/web/admin/src/views/System/AuthClient/Editor.vue
+++ b/client/web/admin/src/views/System/AuthClient/Editor.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     v-if="authclient"
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="title"
diff --git a/client/web/admin/src/views/System/AuthClient/List.vue b/client/web/admin/src/views/System/AuthClient/List.vue
index 31f815e17..1446c57c2 100644
--- a/client/web/admin/src/views/System/AuthClient/List.vue
+++ b/client/web/admin/src/views/System/AuthClient/List.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
     fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -27,7 +28,7 @@
       clickable
       sticky-header
       hide-search
-      class="custom-resource-list-height"
+      class="custom-resource-list-height flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >
diff --git a/client/web/admin/src/views/System/Connection/Editor.vue b/client/web/admin/src/views/System/Connection/Editor.vue
index cbb457e20..3318416a8 100644
--- a/client/web/admin/src/views/System/Connection/Editor.vue
+++ b/client/web/admin/src/views/System/Connection/Editor.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="connectionID ? $t('title.edit') : $t('title.create')"
diff --git a/client/web/admin/src/views/System/Connection/Index.vue b/client/web/admin/src/views/System/Connection/Index.vue
index 98104a96b..37615b6ed 100644
--- a/client/web/admin/src/views/System/Connection/Index.vue
+++ b/client/web/admin/src/views/System/Connection/Index.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
-    class="py-3 h-100"
+    fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header
       :title="$t('title')"
@@ -14,7 +15,7 @@
       />
 
       <c-external-connection-list
-        class="mb-4 flex-fill"
+        class="flex-fill"
       />
 
       <!-- <c-federated-node-list /> -->
diff --git a/client/web/admin/src/views/System/Email/Index.vue b/client/web/admin/src/views/System/Email/Index.vue
index f162c7991..ca26da917 100644
--- a/client/web/admin/src/views/System/Email/Index.vue
+++ b/client/web/admin/src/views/System/Email/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="$t('title')"
diff --git a/client/web/admin/src/views/System/Permissions/Index.vue b/client/web/admin/src/views/System/Permissions/Index.vue
index 8a09537e2..b3327a69d 100644
--- a/client/web/admin/src/views/System/Permissions/Index.vue
+++ b/client/web/admin/src/views/System/Permissions/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     fluid
-    class="d-flex flex-column h-100 py-3"
+    class="d-flex flex-column h-100 pt-2 pb-3"
   >
     <c-content-header
       :title="$t('ui.title.system')"
diff --git a/client/web/admin/src/views/System/Queue/Editor.vue b/client/web/admin/src/views/System/Queue/Editor.vue
index b892aa3f2..303aa4171 100644
--- a/client/web/admin/src/views/System/Queue/Editor.vue
+++ b/client/web/admin/src/views/System/Queue/Editor.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     v-if="queue"
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="title"
diff --git a/client/web/admin/src/views/System/Queue/List.vue b/client/web/admin/src/views/System/Queue/List.vue
index b6af67ba7..af84fab0e 100644
--- a/client/web/admin/src/views/System/Queue/List.vue
+++ b/client/web/admin/src/views/System/Queue/List.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
     fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -26,7 +27,7 @@
       }"
       clickable
       sticky-header
-      class="custom-resource-list-height"
+      class="custom-resource-list-height flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >
diff --git a/client/web/admin/src/views/System/Role/Editor.vue b/client/web/admin/src/views/System/Role/Editor.vue
index 29bb411f5..5ee53f1d7 100644
--- a/client/web/admin/src/views/System/Role/Editor.vue
+++ b/client/web/admin/src/views/System/Role/Editor.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     v-if="role"
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="title"
diff --git a/client/web/admin/src/views/System/Role/List.vue b/client/web/admin/src/views/System/Role/List.vue
index 253068b00..682ab4e2c 100644
--- a/client/web/admin/src/views/System/Role/List.vue
+++ b/client/web/admin/src/views/System/Role/List.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
     fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -26,7 +27,7 @@
       }"
       clickable
       sticky-header
-      class="custom-resource-list-height"
+      class="custom-resource-list-height flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >
diff --git a/client/web/admin/src/views/System/SensitivityLevel/Editor.vue b/client/web/admin/src/views/System/SensitivityLevel/Editor.vue
index adaf21944..4c2ee13e9 100644
--- a/client/web/admin/src/views/System/SensitivityLevel/Editor.vue
+++ b/client/web/admin/src/views/System/SensitivityLevel/Editor.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     v-if="sensitivityLevel"
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="title"
diff --git a/client/web/admin/src/views/System/SensitivityLevel/List.vue b/client/web/admin/src/views/System/SensitivityLevel/List.vue
index 1ed13b147..21aa5c03e 100644
--- a/client/web/admin/src/views/System/SensitivityLevel/List.vue
+++ b/client/web/admin/src/views/System/SensitivityLevel/List.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
     fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -26,7 +27,7 @@
       clickable
       sticky-header
       hide-search
-      class="custom-resource-list-height"
+      class="custom-resource-list-height flex-fill"
       @row-clicked="handleRowClicked"
     >
       <template #header>
diff --git a/client/web/admin/src/views/System/Settings/Index.vue b/client/web/admin/src/views/System/Settings/Index.vue
index ec5accb5b..d35ece836 100644
--- a/client/web/admin/src/views/System/Settings/Index.vue
+++ b/client/web/admin/src/views/System/Settings/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="$t('title')"
diff --git a/client/web/admin/src/views/System/Template/Editor.vue b/client/web/admin/src/views/System/Template/Editor.vue
index c1cf79a8f..657c27d71 100644
--- a/client/web/admin/src/views/System/Template/Editor.vue
+++ b/client/web/admin/src/views/System/Template/Editor.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     v-if="template"
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="title"
diff --git a/client/web/admin/src/views/System/Template/List.vue b/client/web/admin/src/views/System/Template/List.vue
index 9a1b162b6..20696c5e3 100644
--- a/client/web/admin/src/views/System/Template/List.vue
+++ b/client/web/admin/src/views/System/Template/List.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
     fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -26,7 +27,7 @@
       }"
       clickable
       sticky-header
-      class="custom-resource-list-height"
+      class="custom-resource-list-height flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >
diff --git a/client/web/admin/src/views/System/User/Editor.vue b/client/web/admin/src/views/System/User/Editor.vue
index 5d3bb29c4..b5d85371b 100644
--- a/client/web/admin/src/views/System/User/Editor.vue
+++ b/client/web/admin/src/views/System/User/Editor.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     v-if="user"
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="title"
diff --git a/client/web/admin/src/views/System/User/List.vue b/client/web/admin/src/views/System/User/List.vue
index c2717ba4e..b33b771de 100644
--- a/client/web/admin/src/views/System/User/List.vue
+++ b/client/web/admin/src/views/System/User/List.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
     fluid="xl"
+    class="d-flex flex-column flex-fill pt-2 pb-3"
   >
     <c-content-header :title="$t('title')" />
 
@@ -26,7 +27,7 @@
       }"
       clickable
       sticky-header
-      class="custom-resource-list-height"
+      class="custom-resource-list-height flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >
diff --git a/client/web/admin/src/views/UI/Index.vue b/client/web/admin/src/views/UI/Index.vue
index ac3ff7a1e..111e1ab79 100644
--- a/client/web/admin/src/views/UI/Index.vue
+++ b/client/web/admin/src/views/UI/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <b-container
-    class="py-3"
+    class="pt-2 pb-3"
   >
     <c-content-header
       :title="$t('title')"
diff --git a/client/web/compose/src/views/Admin/Charts/List.vue b/client/web/compose/src/views/Admin/Charts/List.vue
index c2664c471..9ae6f045e 100644
--- a/client/web/compose/src/views/Admin/Charts/List.vue
+++ b/client/web/compose/src/views/Admin/Charts/List.vue
@@ -28,7 +28,7 @@
       }"
       clickable
       sticky-header
-      class="h-100"
+      class="h-100 flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >
diff --git a/client/web/compose/src/views/Admin/Modules/List.vue b/client/web/compose/src/views/Admin/Modules/List.vue
index 12f56695c..7b8cbf745 100644
--- a/client/web/compose/src/views/Admin/Modules/List.vue
+++ b/client/web/compose/src/views/Admin/Modules/List.vue
@@ -29,7 +29,7 @@
       }"
       clickable
       sticky-header
-      class="h-100"
+      class="h-100 flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >
diff --git a/client/web/compose/src/views/Namespace/Manage.vue b/client/web/compose/src/views/Namespace/Manage.vue
index d6a124578..4c27b861f 100644
--- a/client/web/compose/src/views/Namespace/Manage.vue
+++ b/client/web/compose/src/views/Namespace/Manage.vue
@@ -45,7 +45,7 @@
       }"
       clickable
       sticky-header
-      class="h-100"
+      class="h-100 flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >
diff --git a/client/web/one/src/components/CAppSelector.vue b/client/web/one/src/components/CAppSelector.vue
index a4e05faa7..3e3cd53a5 100644
--- a/client/web/one/src/components/CAppSelector.vue
+++ b/client/web/one/src/components/CAppSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="app-selector d-flex flex-column h-100"
+    class="app-selector d-flex flex-column h-100 mt-3"
   >
     <div class="d-flex justify-content-center align-items-center">
       <b-img
diff --git a/client/web/reporter/src/views/Report/List.vue b/client/web/reporter/src/views/Report/List.vue
index 8011fee76..c841c3ed1 100644
--- a/client/web/reporter/src/views/Report/List.vue
+++ b/client/web/reporter/src/views/Report/List.vue
@@ -28,7 +28,7 @@
       }"
       sticky-header
       clickable
-      class="h-100"
+      class="h-100 flex-fill"
       @search="filterList"
       @row-clicked="viewReport"
     >
diff --git a/client/web/workflow/src/views/Workflow/List.vue b/client/web/workflow/src/views/Workflow/List.vue
index 74e33abc8..e3ef3c5ca 100644
--- a/client/web/workflow/src/views/Workflow/List.vue
+++ b/client/web/workflow/src/views/Workflow/List.vue
@@ -1,7 +1,7 @@
 <template>
   <b-container
     fluid="xl"
-    class="py-3 d-flex flex-column"
+    class="d-flex flex-column py-3"
   >
     <portal to="topbar-title">
       {{ $t('general:workflow-list') }}
@@ -29,7 +29,7 @@
       }"
       clickable
       sticky-header
-      class="h-100"
+      class="h-100 flex-fill"
       @search="filterList"
       @row-clicked="handleRowClicked"
     >