diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index 5e78ba56..2924749e 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -35,8 +35,8 @@
       </Dropdown>
     </template>
   </LayoutHeader>
-  <div class="flex h-full overflow-hidden">
-    <TabGroup v-slot="{ selectedIndex }" v-if="deal.data" @change="onTabChange">
+  <div v-if="deal.data" class="flex h-full overflow-hidden">
+    <TabGroup v-slot="{ selectedIndex }" @change="onTabChange">
       <div class="flex flex-col flex-1">
         <TabList class="flex items-center gap-6 border-b pl-5 relative">
           <Tab
@@ -132,10 +132,12 @@
                 </div>
               </Dropdown>
             </div>
-            <div class="flex flex-col gap-2.5">
-              <div class="font-medium text-2xl">
-                {{ deal.data.organization_name }}
-              </div>
+            <div class="flex flex-col gap-2.5 truncate">
+              <Tooltip :text="deal.data.organization_name">
+                <div class="font-medium text-2xl truncate">
+                  {{ deal.data.organization_name }}
+                </div>
+              </Tooltip>
               <div class="flex gap-1.5">
                 <Tooltip text="Make a call...">
                   <Button
@@ -465,7 +467,7 @@ const tabs = computed(() => {
       label: 'Activity',
       icon: ActivityIcon,
       content: all_activities(),
-      activityTitle: 'Activity log',
+      activityTitle: 'Activity',
     },
     {
       label: 'Emails',
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 80131aa8..66dbf889 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -38,8 +38,8 @@
       />
     </template>
   </LayoutHeader>
-  <div class="flex h-full overflow-hidden">
-    <TabGroup v-slot="{ selectedIndex }" v-if="lead.data" @change="onTabChange">
+  <div v-if="lead.data" class="flex h-full overflow-hidden">
+    <TabGroup v-slot="{ selectedIndex }" @change="onTabChange">
       <div class="flex flex-col flex-1">
         <TabList class="flex items-center gap-6 border-b pl-5 relative">
           <Tab
@@ -133,10 +133,12 @@
                 </div>
               </Dropdown>
             </div>
-            <div class="flex flex-col gap-2.5">
-              <div class="font-medium text-2xl">
-                {{ lead.data.lead_name }}
-              </div>
+            <div class="flex flex-col gap-2.5 truncate">
+              <Tooltip :text="lead.data.lead_name">
+                <div class="font-medium text-2xl truncate">
+                  {{ lead.data.lead_name }}
+                </div>
+              </Tooltip>
               <div class="flex gap-1.5">
                 <Tooltip text="Make a call...">
                   <Button
@@ -426,7 +428,7 @@ const tabs = computed(() => {
       label: 'Activity',
       icon: ActivityIcon,
       content: all_activities(),
-      activityTitle: 'Activity log',
+      activityTitle: 'Activity',
     },
     {
       label: 'Emails',