diff --git a/templates/crm/opportunities/opportunity_detail.html b/templates/crm/opportunities/opportunity_detail.html
index 68929db0..4c6d700e 100644
--- a/templates/crm/opportunities/opportunity_detail.html
+++ b/templates/crm/opportunities/opportunity_detail.html
@@ -1,14 +1,6 @@
 {% 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">
@@ -87,12 +79,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 ">
+                    <li class="list-group-item d-flex justify-content-between align-items-center">
+                      <div class="d-flex align-items-center">
                         <span class="badge rounded-pill bg-phoenix-primary text-primary me-2 fs-9">{{ event.scheduled_type|capfirst }}</span>
-                        <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>
+                        <span class="fs-9">{{ event.purpose }}</span>
+                      </div>
+                      <div class="fs-9">{{ event.scheduled_at|naturaltime|capfirst }}</div>
                     </li>
                   {% empty %}
                     <li class="list-group-item text-center fs-9">{{ _("No upcoming events") }}</li>
@@ -107,22 +99,12 @@
             <h4 class="mb-5 d-flex align-items-center"><span class="d-inline-block lh-sm me-1" data-feather="link" style="height:16px;width:16px;"></span> {{ _("Related Records")}}</h4>
             <div class="row g-3">
               <div class="col-12">
-                <div class="mb-4">
-                  <div class="d-flex flex-wrap justify-content-between mb-2">
-                    <h5 class="mb-0 text-body-highlight me-2">{{ _("Lead") }}</h5>
-                  </div>
-                  {% if opportunity.lead %}
-                    <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 %}
-                </div>
                 <div class="mb-4">
                   <div class="d-flex flex-wrap justify-content-between mb-2">
                     <h5 class="mb-0 text-body-highlight me-2">{{ _("Estimate") }}</h5>
                   </div>
                   {% if opportunity.estimate %}
-                    <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>
+                    <a class="dropdown-item" href="{% url 'estimate_detail' opportunity.estimate.pk %}">{{ _("View Quotation")}}</a>
                   {% else %}
                     <p>{{ _("No Estimate") }}</p>
                   {% endif %}
@@ -132,7 +114,7 @@
                     <h5 class="mb-0 text-body-highlight me-2">{{ _("Invoice") }}</h5>
                   </div>
                     {% if opportunity.estimate.invoice %}
-                    <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>
+                    <a class="dropdown-item" href="{% url 'invoice_detail' opportunity.estimate.invoice.pk %}">{{ _("View Invoice")}}</a>
                   {% else %}
                     <p>{{ _("No Invoice") }}</p>
                   {% endif %}
@@ -183,7 +165,7 @@
             </div>
             <div class="col-sm-auto">
               <div class="d-sm-block d-inline-flex d-md-flex flex-xl-column flex-xxl-row align-items-center align-items-xl-start align-items-xxl-center border-start-sm ps-sm-5 border-translucent">
-                <div class="d-flex bg-success-subtle rounded flex-center me-3 mb-sm-3 mb-md-0 mb-xl-3 mb-xxl-0" style="width:32px; height:32px"><span class="text-success-dark currency" style="width:24px; height:24px">{{CURRENCY}}</span></div>
+                <div class="d-flex bg-success-subtle rounded flex-center me-3 mb-sm-3 mb-md-0 mb-xl-3 mb-xxl-0" style="width:32px; height:32px"><span class="text-success-dark currency" style="width:40px; height:24px">{{CURRENCY}}</span></div>
                 <div>
                   <p class="fw-bold mb-1">{{ _("Amount") }}</p>
                   <h4 class="fw-bolder text-nowrap">{{opportunity.amount}}</h4>
@@ -192,7 +174,7 @@
             </div>
             <div class="col-sm-auto">
               <div class="d-sm-block d-inline-flex d-md-flex flex-xl-column flex-xxl-row align-items-center align-items-xl-start align-items-xxl-center border-start-sm ps-sm-5 border-translucent">
-                <div class="d-flex bg-success-subtle rounded flex-center me-3 mb-sm-3 mb-md-0 mb-xl-3 mb-xxl-0" style="width:32px; height:32px"><span class="text-success-dark currency" style="width:24px; height:24px">{{CURRENCY}}</span></div>
+                <div class="d-flex bg-success-subtle rounded flex-center me-3 mb-sm-3 mb-md-0 mb-xl-3 mb-xxl-0" style="width:32px; height:32px"><span class="text-success-dark currency" style="width:40px; height:24px">{{CURRENCY}}</span></div>
                 <div>
                   <p class="fw-bold mb-1">{{ _("Expected Revenue") }}</p>
                   <h4 class="fw-bolder text-nowrap">{{opportunity.expected_revenue}}</h4>
@@ -252,7 +234,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.lead.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.customer.phone_number  }}</a></td>
               </tr>
               <tr>
                 <td class="py-2">
@@ -262,7 +244,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.lead.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.customer.email}}</a></td>
               </tr>
             </table>
           </div>
@@ -450,7 +432,7 @@
             </div>
           </div>
           <div class="row g-3">
-            {% for metting in opportunity.get_meetings %}
+            {% for metting in opportunity.lead.get_meetings %}
               <div class="col-xxl-6">
                 <div class="card h-100">
                   <div class="card-body">
@@ -472,10 +454,12 @@
             <div class="col-auto d-flex flex-1">
               <h2 class="mb-0">Call</h2>
             </div>
+
             <div class="col-auto">
               <a href="{% url 'schedule_lead' opportunity.lead.slug %}" class="btn btn-primary"><span class="fa-solid fa-plus me-2"></span>Add Call</a>
             </div>
           </div>
+          <pre>{{opportunity.get_all_notes}}</pre>
           <div class="border-top border-bottom border-translucent" id="leadDetailsTable" data-list='{"valueNames":["name","description","create_date","create_by","last_activity"],"page":5,"pagination":true}'>
             <div class="table-responsive scrollbar mx-n1 px-1">
               <table class="table fs-9 mb-0">
@@ -487,7 +471,7 @@
                   </tr>
                 </thead>
                 <tbody class="list" id="lead-details-table-body">
-                  {% for call in opportunity.get_calls %}
+                  {% for call in opportunity.lead.get_calls %}
                     <tr class="hover-actions-trigger btn-reveal-trigger position-static">
                       <td class="description align-middle white-space-nowrap text-start fw-bold text-body-tertiary py-2 pe-6">{{call.purpose}}</td>
                       <td class="create_date text-end align-middle white-space-nowrap text-body py-2">{{call.scheduled_by}}</td>
@@ -559,7 +543,7 @@
                         </tr>
                       </thead>
                       <tbody class="list" id="all-email-table-body">
-                        {% for email in opportunity.get_emails %}
+                        {% for email in opportunity.lead.get_emails %}
                           <tr class="hover-actions-trigger btn-reveal-trigger position-static">
                             <td class="fs-9 align-middle px-0 py-3">
                               <div class="form-check mb-0 fs-8">