diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.py b/crm/fcrm/doctype/crm_deal/crm_deal.py
index ac215ed5..bd775193 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.py
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.py
@@ -139,6 +139,7 @@ class CRMDeal(Document):
 			"mobile_no",
 			"deal_owner",
 			"sla_status",
+			"response_by",
 			"first_response_time",
 			"first_responded_on",
 			"modified",
diff --git a/crm/fcrm/doctype/crm_lead/crm_lead.py b/crm/fcrm/doctype/crm_lead/crm_lead.py
index f8a0fb6d..bd26b6a5 100644
--- a/crm/fcrm/doctype/crm_lead/crm_lead.py
+++ b/crm/fcrm/doctype/crm_lead/crm_lead.py
@@ -219,6 +219,7 @@ class CRMLead(Document):
 			"lead_owner",
 			"first_name",
 			"sla_status",
+			"response_by",
 			"first_response_time",
 			"first_responded_on",
 			"modified",
diff --git a/frontend/src/components/ListViews/DealsListView.vue b/frontend/src/components/ListViews/DealsListView.vue
index 72efab98..a02b6996 100644
--- a/frontend/src/components/ListViews/DealsListView.vue
+++ b/frontend/src/components/ListViews/DealsListView.vue
@@ -51,6 +51,7 @@
                 'creation',
                 'first_response_time',
                 'first_responded_on',
+                'response_by',
               ].includes(column.key)
             "
             class="truncate text-base"
@@ -62,11 +63,11 @@
             class="truncate text-base"
           >
             <Badge
-              v-if="item.label"
+              v-if="item.value"
               :variant="'subtle'"
               :theme="item.color"
               size="md"
-              :label="item.label"
+              :label="item.value"
             />
           </div>
           <div v-else-if="column.type === 'Check'">
diff --git a/frontend/src/components/ListViews/LeadsListView.vue b/frontend/src/components/ListViews/LeadsListView.vue
index 01eae1e0..c8d78b8d 100644
--- a/frontend/src/components/ListViews/LeadsListView.vue
+++ b/frontend/src/components/ListViews/LeadsListView.vue
@@ -60,6 +60,7 @@
                 'creation',
                 'first_response_time',
                 'first_responded_on',
+                'response_by',
               ].includes(column.key)
             "
             class="truncate text-base"
@@ -71,11 +72,11 @@
             class="truncate text-base"
           >
             <Badge
-              v-if="item.label"
+              v-if="item.value"
               :variant="'subtle'"
               :theme="item.color"
               size="md"
-              :label="item.label"
+              :label="item.value"
             />
           </div>
           <div v-else-if="column.type === 'Check'">
diff --git a/frontend/src/components/SectionFields.vue b/frontend/src/components/SectionFields.vue
index d6e7ca7a..460f01c8 100644
--- a/frontend/src/components/SectionFields.vue
+++ b/frontend/src/components/SectionFields.vue
@@ -3,12 +3,12 @@
     <div
       v-for="field in fields"
       :key="field.label"
-      class="flex items-center gap-2 px-3 text-base leading-5 first:mt-3"
+      class="flex items-center gap-2 px-3 leading-5 first:mt-3"
     >
-      <div class="w-[106px] shrink-0 text-gray-600">
+      <div class="w-[106px] shrink-0 text-sm text-gray-600">
         {{ field.label }}
       </div>
-      <div class="grid min-h-[28px] flex-1 items-center overflow-hidden">
+      <div class="grid min-h-[28px] flex-1 text-base items-center overflow-hidden">
         <FormControl
           v-if="
             [
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index 3d165402..f30ea416 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -389,15 +389,6 @@ const deal = createResource({
   params: { name: props.dealId },
   cache: ['deal', props.dealId],
   auto: true,
-  onSuccess: (data) => {
-    if (
-      data.response_by &&
-      data.sla_status == 'First Response Due' &&
-      new Date(data.response_by) < new Date()
-    ) {
-      updateField('sla_status', 'Failed')
-    }
-  },
 })
 
 const reload = ref(false)
diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
index 65b555c4..4cb7b844 100644
--- a/frontend/src/pages/Deals.vue
+++ b/frontend/src/pages/Deals.vue
@@ -156,14 +156,25 @@ const rows = computed(() => {
           color: getDealStatus(deal.status)?.iconColorClass,
         }
       } else if (row == 'sla_status') {
+        let value = deal.sla_status
+        let tooltipText = value
+        let color =
+          deal.sla_status == 'Failed'
+            ? 'red'
+            : deal.sla_status == 'Fulfilled'
+            ? 'green'
+            : 'orange'
+        if (value == 'First Response Due') {
+          value = timeAgo(deal.response_by)
+          tooltipText = dateFormat(deal.response_by, dateTooltipFormat)
+          if (new Date(deal.response_by) < new Date()) {
+            color = 'red'
+          }
+        }
         _rows[row] = {
-          label: deal.sla_status,
-          color:
-            deal.sla_status === 'Failed'
-              ? 'red'
-              : deal.sla_status === 'Fulfilled'
-              ? 'green'
-              : 'gray',
+          label: tooltipText,
+          value: value,
+          color: color,
         }
       } else if (row == 'deal_owner') {
         _rows[row] = {
@@ -175,15 +186,18 @@ const rows = computed(() => {
           label: dateFormat(deal[row], dateTooltipFormat),
           timeAgo: timeAgo(deal[row]),
         }
-      } else if (['first_response_time', 'first_responded_on'].includes(row)) {
+      } else if (
+        ['first_response_time', 'first_responded_on', 'response_by'].includes(
+          row
+        )
+      ) {
+        let field = row == 'response_by' ? 'response_by' : 'first_responded_on'
         _rows[row] = {
-          label: deal.first_responded_on
-            ? dateFormat(deal.first_responded_on, dateTooltipFormat)
-            : '',
+          label: deal[field] ? dateFormat(deal[field], dateTooltipFormat) : '',
           timeAgo: deal[row]
-            ? row == 'first_responded_on'
-              ? timeAgo(deal[row])
-              : formatTime(deal[row])
+            ? row == 'first_response_time'
+              ? formatTime(deal[row])
+              : timeAgo(deal[row])
             : '',
         }
       }
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 17853504..bb24f0b7 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -141,69 +141,16 @@
       </FileUploader>
       <div v-if="lead.data.sla_status" class="flex flex-col gap-2 border-b p-5">
         <div
-          v-if="lead.data.sla_status == 'First Response Due'"
+          v-for="s in slaSection"
+          :key="s.label"
           class="flex items-center gap-4 text-base leading-5"
         >
-          <div class="w-[106px] text-gray-600">Response By</div>
-          <Tooltip
-            :text="dateFormat(lead.data.response_by, 'ddd, MMM D, YYYY h:mm A')"
-            class="cursor-pointer"
-          >
-            {{ timeAgo(lead.data.response_by) }}
+          <div class="w-[106px] text-gray-600">{{ s.label }}</div>
+          <Tooltip :text="s.tooltipText" class="cursor-pointer">
+            <div v-if="!s.isBadge">{{ s.value }}</div>
+            <Badge v-else :label="s.value" variant="subtle" :theme="s.color" />
           </Tooltip>
         </div>
-        <div
-          v-if="lead.data.sla_status == 'Fulfilled'"
-          class="flex items-center gap-4 text-base leading-5"
-        >
-          <div class="w-[106px] text-gray-600">Fulfilled In</div>
-          <Tooltip
-            :text="
-              dateFormat(
-                lead.data.first_responded_on,
-                'ddd, MMM D, YYYY h:mm A'
-              )
-            "
-            class="cursor-pointer"
-          >
-            {{ formatTime(lead.data.first_response_time) }}
-          </Tooltip>
-        </div>
-        <div
-          v-if="
-            lead.data.sla_status == 'Failed' && lead.data.first_responded_on
-          "
-          class="flex items-center gap-4 text-base leading-5"
-        >
-          <div class="w-[106px] text-gray-600">Fulfilled In</div>
-          <Tooltip
-            :text="
-              dateFormat(
-                lead.data.first_responded_on,
-                'ddd, MMM D, YYYY h:mm A'
-              )
-            "
-            class="cursor-pointer"
-          >
-            {{ formatTime(lead.data.first_response_time) }}
-          </Tooltip>
-        </div>
-        <div class="flex items-center gap-4 text-base leading-5">
-          <div class="w-[106px] text-gray-600">Status</div>
-          <div class="">
-            <Badge
-              :label="lead.data.sla_status"
-              variant="outline"
-              :theme="
-                lead.data.sla_status === 'Failed'
-                  ? 'red'
-                  : lead.data.sla_status === 'Fulfilled'
-                  ? 'green'
-                  : 'gray'
-              "
-            />
-          </div>
-        </div>
       </div>
       <div class="flex flex-1 flex-col justify-between overflow-hidden">
         <div class="flex flex-col overflow-y-auto">
@@ -259,6 +206,7 @@ import {
   dateFormat,
   timeAgo,
   formatTime,
+  dateTooltipFormat,
 } from '@/utils'
 import { usersStore } from '@/stores/users'
 import { contactsStore } from '@/stores/contacts'
@@ -298,15 +246,6 @@ const lead = createResource({
   params: { name: props.leadId },
   cache: ['lead', props.leadId],
   auto: true,
-  onSuccess: (data) => {
-    if (
-      data.response_by &&
-      data.sla_status == 'First Response Due' &&
-      new Date(data.response_by) < new Date()
-    ) {
-      updateField('sla_status', 'Failed')
-    }
-  },
 })
 
 const reload = ref(false)
@@ -441,4 +380,41 @@ function updateField(name, value, callback) {
     callback?.()
   })
 }
+
+let slaSection = computed(() => {
+  let sections = []
+  if (lead.data.first_response_time) {
+    sections.push({
+      label: 'Fulfilled In',
+      value: formatTime(lead.data.first_response_time),
+      tooltipText: dateFormat(lead.data.first_responded_on, dateTooltipFormat),
+    })
+  }
+
+  let status = lead.data.sla_status
+  let tooltipText = status
+  let color =
+    lead.data.sla_status == 'Failed'
+      ? 'red'
+      : lead.data.sla_status == 'Fulfilled'
+      ? 'green'
+      : 'orange'
+
+  if (status == 'First Response Due') {
+    status = timeAgo(lead.data.response_by)
+    tooltipText = dateFormat(lead.data.response_by, dateTooltipFormat)
+    if (new Date(lead.data.response_by) < new Date()) {
+      color = 'red'
+    }
+  }
+
+  sections.push({
+    label: 'Status',
+    isBadge: true,
+    value: status,
+    tooltipText: tooltipText,
+    color: color,
+  })
+  return sections
+})
 </script>
diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
index c52fb9b0..f4b25b30 100644
--- a/frontend/src/pages/Leads.vue
+++ b/frontend/src/pages/Leads.vue
@@ -155,14 +155,25 @@ const rows = computed(() => {
           color: getLeadStatus(lead.status)?.iconColorClass,
         }
       } else if (row == 'sla_status') {
+        let value = lead.sla_status
+        let tooltipText = value
+        let color =
+          lead.sla_status == 'Failed'
+            ? 'red'
+            : lead.sla_status == 'Fulfilled'
+            ? 'green'
+            : 'orange'
+        if (value == 'First Response Due') {
+          value = timeAgo(lead.response_by)
+          tooltipText = dateFormat(lead.response_by, dateTooltipFormat)
+          if (new Date(lead.response_by) < new Date()) {
+            color = 'red'
+          }
+        }
         _rows[row] = {
-          label: lead.sla_status,
-          color:
-            lead.sla_status === 'Failed'
-              ? 'red'
-              : lead.sla_status === 'Fulfilled'
-              ? 'green'
-              : 'gray',
+          label: tooltipText,
+          value: value,
+          color: color,
         }
       } else if (row == 'lead_owner') {
         _rows[row] = {
@@ -174,15 +185,18 @@ const rows = computed(() => {
           label: dateFormat(lead[row], dateTooltipFormat),
           timeAgo: timeAgo(lead[row]),
         }
-      } else if (['first_response_time', 'first_responded_on'].includes(row)) {
+      } else if (
+        ['first_response_time', 'first_responded_on', 'response_by'].includes(
+          row
+        )
+      ) {
+        let field = row == 'response_by' ? 'response_by' : 'first_responded_on'
         _rows[row] = {
-          label: lead.first_responded_on
-            ? dateFormat(lead.first_responded_on, dateTooltipFormat)
-            : '',
+          label: lead[field] ? dateFormat(lead[field], dateTooltipFormat) : '',
           timeAgo: lead[row]
-            ? row == 'first_responded_on'
-              ? timeAgo(lead[row])
-              : formatTime(lead[row])
+            ? row == 'first_response_time'
+              ? formatTime(lead[row])
+              : timeAgo(lead[row])
             : '',
         }
       }