diff --git a/resources/scripts/components/base/BaseCustomerSelectPopup.vue b/resources/scripts/components/base/BaseCustomerSelectPopup.vue
index 4a24a69e..0f5a8e27 100644
--- a/resources/scripts/components/base/BaseCustomerSelectPopup.vue
+++ b/resources/scripts/components/base/BaseCustomerSelectPopup.vue
@@ -23,9 +23,11 @@
       @click.stop
     >
       <div class="flex relative justify-between mb-2">
-        <label class="flex-1 text-base font-medium text-left text-gray-900">
-          {{ selectedCustomer.name }}
-        </label>
+        <BaseText
+          :text="selectedCustomer.name"
+          :length="30"
+          class="flex-1 text-base font-medium text-left text-gray-900"
+        />
         <div class="flex">
           <a
             class="
diff --git a/resources/scripts/views/customers/Index.vue b/resources/scripts/views/customers/Index.vue
index 2829a988..2566382b 100644
--- a/resources/scripts/views/customers/Index.vue
+++ b/resources/scripts/views/customers/Index.vue
@@ -149,23 +149,19 @@
         </template>
 
         <template #cell-name="{ row }">
-          <router-link
-            :to="{ path: `customers/${row.data.id}/view` }"
-          >
-          <BaseText
-            :text="row.data.name"
-            :length="30"
-            tag="span"
-            class="font-medium text-primary-500 flex flex-col"
-          >
-            {{ row.data.name }}
-          </BaseText>
-          <BaseText
-            :text="row.data.contact_name ? row.data.contact_name : ''"
-            :length="30"
-            tag="span"
-            class="text-xs text-gray-400"
-          />
+          <router-link :to="{ path: `customers/${row.data.id}/view` }">
+            <BaseText
+              :text="row.data.name"
+              :length="30"
+              tag="span"
+              class="font-medium text-primary-500 flex flex-col"
+            />
+            <BaseText
+              :text="row.data.contact_name ? row.data.contact_name : ''"
+              :length="30"
+              tag="span"
+              class="text-xs text-gray-400"
+            />
           </router-link>
         </template>
 
diff --git a/resources/scripts/views/estimates/Index.vue b/resources/scripts/views/estimates/Index.vue
index 94709eeb..09bbc3e4 100644
--- a/resources/scripts/views/estimates/Index.vue
+++ b/resources/scripts/views/estimates/Index.vue
@@ -184,7 +184,7 @@
 
         <!-- Estimate date  -->
         <template #cell-estimate_date="{ row }">
-            {{ row.data.formatted_estimate_date }}
+          {{ row.data.formatted_estimate_date }}
         </template>
 
         <template #cell-estimate_number="{ row }">
@@ -197,10 +197,7 @@
         </template>
 
         <template #cell-name="{ row }">
-          <BaseText
-            :text="row.data.customer.name"
-            :length="30"
-          />
+          <BaseText :text="row.data.customer.name" :length="30" />
         </template>
 
         <template #cell-status="{ row }">
diff --git a/resources/scripts/views/expenses/Index.vue b/resources/scripts/views/expenses/Index.vue
index a93808ee..b478960f 100644
--- a/resources/scripts/views/expenses/Index.vue
+++ b/resources/scripts/views/expenses/Index.vue
@@ -187,7 +187,7 @@
 
         <template #cell-user_name="{ row }">
           <BaseText
-            :text="row.data.customer ? row.data.customer.name : '-' "
+            :text="row.data.customer ? row.data.customer.name : '-'"
             :length="30"
           />
         </template>
diff --git a/resources/scripts/views/recurring-invoices/Index.vue b/resources/scripts/views/recurring-invoices/Index.vue
index 78fb16dc..58ead787 100644
--- a/resources/scripts/views/recurring-invoices/Index.vue
+++ b/resources/scripts/views/recurring-invoices/Index.vue
@@ -189,29 +189,29 @@
 
         <!-- Starts at  -->
         <template #cell-starts_at="{ row }">
-            {{ row.data.formatted_starts_at }}
+          {{ row.data.formatted_starts_at }}
         </template>
 
         <!-- Customer  -->
         <template #cell-customer="{ row }">
-          <router-link
-            :to="{ path: `recurring-invoices/${row.data.id}/view` }"
-          >
-          <BaseText
-            :text="row.data.customer.name"
-            :length="30"
-            tag="span"
-            class="font-medium text-primary-500 flex flex-col"
-          >
-            {{ row.data.customer.name }}
-          </BaseText>
-          
-          <BaseText
-            :text="row.data.customer.contact_name ? row.data.customer.contact_name: ''"
-            :length="30"
-            tag="span"
-            class="text-xs text-gray-400"
-          />
+          <router-link :to="{ path: `recurring-invoices/${row.data.id}/view` }">
+            <BaseText
+              :text="row.data.customer.name"
+              :length="30"
+              tag="span"
+              class="font-medium text-primary-500 flex flex-col"
+            />
+
+            <BaseText
+              :text="
+                row.data.customer.contact_name
+                  ? row.data.customer.contact_name
+                  : ''
+              "
+              :length="30"
+              tag="span"
+              class="text-xs text-gray-400"
+            />
           </router-link>
         </template>