diff --git a/frontend/src/components/ListViews/ContactsListView.vue b/frontend/src/components/ListViews/ContactsListView.vue
index a4a214c2..5b636ac7 100644
--- a/frontend/src/components/ListViews/ContactsListView.vue
+++ b/frontend/src/components/ListViews/ContactsListView.vue
@@ -1,5 +1,6 @@
 <template>
   <ListView
+    :class="$attrs.class"
     :columns="columns"
     :rows="rows"
     :options="{
@@ -64,6 +65,7 @@
     <ListSelectBanner />
   </ListView>
   <ListFooter
+    v-if="pageLengthCount"
     class="border-t px-5 py-2"
     v-model="pageLengthCount"
     :options="{
diff --git a/frontend/src/components/ListViews/DealsListView.vue b/frontend/src/components/ListViews/DealsListView.vue
index 9a025966..b939e3e9 100644
--- a/frontend/src/components/ListViews/DealsListView.vue
+++ b/frontend/src/components/ListViews/DealsListView.vue
@@ -1,5 +1,6 @@
 <template>
   <ListView
+    :class="$attrs.class"
     :columns="columns"
     :rows="rows"
     :options="{
@@ -87,6 +88,7 @@
     <ListSelectBanner />
   </ListView>
   <ListFooter
+    v-if="pageLengthCount"
     class="border-t px-5 py-2"
     v-model="pageLengthCount"
     :options="{
diff --git a/frontend/src/components/ListViews/LeadsListView.vue b/frontend/src/components/ListViews/LeadsListView.vue
index f788e512..2372d76a 100644
--- a/frontend/src/components/ListViews/LeadsListView.vue
+++ b/frontend/src/components/ListViews/LeadsListView.vue
@@ -1,5 +1,6 @@
 <template>
   <ListView
+    :class="$attrs.class"
     :columns="columns"
     :rows="rows"
     :options="{
@@ -96,6 +97,7 @@
     <ListSelectBanner />
   </ListView>
   <ListFooter
+    v-if="pageLengthCount"
     class="border-t px-5 py-2"
     v-model="pageLengthCount"
     :options="{
diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index 2dfa6a0f..8147e5f1 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -171,8 +171,8 @@
       </template>
       <template #default="{ tab }">
         <DealsListView
-          class="mt-4"
           v-if="tab.label === 'Deals' && rows.length"
+          class="mt-4"
           :rows="rows"
           :columns="columns"
           :options="{ selectable: false }"
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index 3d4ded0a..94f814d2 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -189,36 +189,34 @@
         </button>
       </template>
       <template #default="{ tab }">
-        <div class="flex h-full">
-          <LeadsListView
-            class="mt-4"
-            v-if="tab.label === 'Leads' && rows.length"
-            :rows="rows"
-            :columns="columns"
-            :options="{ selectable: false }"
-          />
-          <DealsListView
-            class="mt-4"
-            v-if="tab.label === 'Deals' && rows.length"
-            :rows="rows"
-            :columns="columns"
-            :options="{ selectable: false }"
-          />
-          <ContactsListView
-            class="mt-4"
-            v-if="tab.label === 'Contacts' && rows.length"
-            :rows="rows"
-            :columns="columns"
-            :options="{ selectable: false }"
-          />
-          <div
-            v-if="!rows.length"
-            class="grid flex-1 place-items-center text-xl font-medium text-gray-500"
-          >
-            <div class="flex flex-col items-center justify-center space-y-3">
-              <component :is="tab.icon" class="!h-10 !w-10" />
-              <div>No {{ tab.label }} Found</div>
-            </div>
+        <LeadsListView
+          class="mt-4"
+          v-if="tab.label === 'Leads' && rows.length"
+          :rows="rows"
+          :columns="columns"
+          :options="{ selectable: false }"
+        />
+        <DealsListView
+          class="mt-4"
+          v-if="tab.label === 'Deals' && rows.length"
+          :rows="rows"
+          :columns="columns"
+          :options="{ selectable: false }"
+        />
+        <ContactsListView
+          class="mt-4"
+          v-if="tab.label === 'Contacts' && rows.length"
+          :rows="rows"
+          :columns="columns"
+          :options="{ selectable: false }"
+        />
+        <div
+          v-if="!rows.length"
+          class="grid flex-1 place-items-center text-xl font-medium text-gray-500"
+        >
+          <div class="flex flex-col items-center justify-center space-y-3">
+            <component :is="tab.icon" class="!h-10 !w-10" />
+            <div>No {{ tab.label }} Found</div>
           </div>
         </div>
       </template>