diff --git a/templates/crm/opportunities/opportunity_detail.html b/templates/crm/opportunities/opportunity_detail.html
index b84db598..f758cee0 100644
--- a/templates/crm/opportunities/opportunity_detail.html
+++ b/templates/crm/opportunities/opportunity_detail.html
@@ -1,6 +1,14 @@
 {% extends 'base.html' %}
 {% load i18n static humanize %}
 {% block title %}{{ _("Opportunity Detail") }}{% endblock title %}
+{% block customCSS %}
+<style>
+  .completed-task {
+      text-decoration: line-through;
+      opacity: 0.7;
+    }
+</style>
+{% endblock customCSS %}
 {% block content %}
   <div class="row align-items-center justify-content-between g-3 mb-4">
     <div class="col-12 col-md-auto">
@@ -79,12 +87,12 @@
               <div class="col-12 overflow-auto" style="max-height: 200px;">
                 <ul class="list-group list-group-flush">
                   {% for event in opportunity.get_schedules %}
-                    <li class="list-group-item d-flex justify-content-between align-items-center">
-                      <div class="d-flex align-items-center">
+                    <li class="list-group-item d-flex justify-content-between ">
                         <span class="badge rounded-pill bg-phoenix-primary text-primary me-2 fs-9">{{ event.scheduled_type|capfirst }}</span>
-                        <span class="fs-9">{{ event.purpose }}</span>
-                      </div>
-                      <div class="fs-9">{{ event.scheduled_at|naturaltime|capfirst }}</div>
+                        <div class="fs-9 d-flex flex-column">
+                          <span class="fs-9">{{ event.purpose|capfirst }}</span>
+                          <span><span class="badge rounded-pill bg-phoenix-primary text-secondary"><span class="d-inline-block lh-sm me-1" data-feather="clock" style="height:16px;width:16px;"></span> {{ event.scheduled_at|naturaltime|capfirst }}</span></span>
+                        </div>
                     </li>
                   {% empty %}
                     <li class="list-group-item text-center fs-9">{{ _("No upcoming events") }}</li>
@@ -104,7 +112,7 @@
                     <h5 class="mb-0 text-body-highlight me-2">{{ _("Lead") }}</h5>
                   </div>
                   {% if opportunity.lead %}
-                    <a class="dropdown-item d-flex align-items-center" href="{% url 'lead_detail' opportunity.lead.slug %}" target="_blank">{{ _("View Lead")}}&nbsp <span class="d-inline-block lh-sm me-2" data-feather="external-link" style="height:16px;width:16px;"></span></a>
+                    <span class="badge rounded-pill bg-phoenix-primary text-primary"><a class="dropdown-item d-flex align-items-center" href="{% url 'lead_detail' opportunity.lead.slug %}" target="_blank">{{ _("View Lead")}}&nbsp <span class="d-inline-block lh-sm me-2" data-feather="external-link" style="height:16px;width:16px;"></span></a></span>
                   {% else %}
                     <p>{{ _("No Lead") }}</p>
                   {% endif %}
@@ -114,7 +122,7 @@
                     <h5 class="mb-0 text-body-highlight me-2">{{ _("Estimate") }}</h5>
                   </div>
                   {% if opportunity.estimate %}
-                    <a class="dropdown-item" href="{% url 'estimate_detail' opportunity.estimate.pk %}">{{ _("View Quotation")}}</a>
+                    <span class="badge rounded-pill bg-phoenix-primary text-primary"><a class="dropdown-item" href="{% url 'estimate_detail' opportunity.estimate.pk %}">{{ _("View Quotation")}}</a></span>
                   {% else %}
                     <p>{{ _("No Estimate") }}</p>
                   {% endif %}
@@ -124,7 +132,7 @@
                     <h5 class="mb-0 text-body-highlight me-2">{{ _("Invoice") }}</h5>
                   </div>
                     {% if opportunity.estimate.invoice %}
-                    <a class="dropdown-item" href="{% url 'invoice_detail' opportunity.estimate.invoice.pk %}">{{ _("View Invoice")}}</a>
+                    <span class="badge rounded-pill bg-phoenix-primary text-primary"><a class="dropdown-item" href="{% url 'invoice_detail' opportunity.estimate.invoice.pk %}">{{ _("View Invoice")}}</a></span>
                   {% else %}
                     <p>{{ _("No Invoice") }}</p>
                   {% endif %}
@@ -244,7 +252,7 @@
                   </div>
                 </td>
                 <td class="py-2 d-none d-sm-block pe-sm-2">:</td>
-                <td class="py-2"><a class="ps-6 ps-sm-0 fw-semibold mb-0 pb-3 pb-sm-0 text-body" href="tel:{{ opportunity.customer.phone_number }}">{{ opportunity.customer.phone_number  }}</a></td>
+                <td class="py-2"><a class="ps-6 ps-sm-0 fw-semibold mb-0 pb-3 pb-sm-0 text-body" href="tel:{{ opportunity.customer.phone_number }}">{{ opportunity.lead.phone_number  }}</a></td>
               </tr>
               <tr>
                 <td class="py-2">
@@ -254,7 +262,7 @@
                   </div>
                 </td>
                 <td class="py-2 d-none d-sm-block pe-sm-2">:</td>
-                <td class="py-2"><a class="ps-6 ps-sm-0 fw-semibold mb-0 text-body" href="mailto:{{ opportunity.customer.email}}">{{ opportunity.customer.email}}</a></td>
+                <td class="py-2"><a class="ps-6 ps-sm-0 fw-semibold mb-0 text-body" href="mailto:{{ opportunity.customer.email}}">{{ opportunity.lead.email}}</a></td>
               </tr>
             </table>
           </div>