diff --git a/templates/crm/leads/lead_form.html b/templates/crm/leads/lead_form.html
index cd888aa2..2beec219 100644
--- a/templates/crm/leads/lead_form.html
+++ b/templates/crm/leads/lead_form.html
@@ -25,7 +25,7 @@
 
 {% block content %}
     <div class="container-fluid">
-        <h1>{% if object %}{{ _("Update") }}{% else %}{{ _("Create") }}{% endif %}</h1>
+        <h1>{% if object %}{{ _("Update Lead") }}{% else %}{{ _("Create New Lead") }}{% endif %}</h1>
         <div class="row mb-3">
             <div class="col-sm-6 col-md-8">
 
diff --git a/templates/crm/leads/lead_tracking.html b/templates/crm/leads/lead_tracking.html
index cfef8140..9c153639 100644
--- a/templates/crm/leads/lead_tracking.html
+++ b/templates/crm/leads/lead_tracking.html
@@ -77,7 +77,7 @@
             <div class="kanban-column bg-body">
               <div class="kanban-header opacity-75"><span class="text-body">{{ _("New Leads")}} ({{new|length}})</span></div>
               {% for lead in new %}
-                <a href="{% url 'lead_detail' lead.slug %}">
+                <a href="{% url 'lead_detail' request.dealer.slug lead.slug %}">
                   <div class="lead-card">
                     <strong>{{lead.full_name|capfirst}}</strong><br>
                     <small>{{lead.email}}</small><br>
diff --git a/templates/crm/opportunities/opportunity_detail.html b/templates/crm/opportunities/opportunity_detail.html
index 0d544fae..3531048d 100644
--- a/templates/crm/opportunities/opportunity_detail.html
+++ b/templates/crm/opportunities/opportunity_detail.html
@@ -13,7 +13,7 @@
         <ul class="dropdown-menu dropdown-menu-end p-0" style="z-index: 9999;">
           <li>
             {% if opportunity.estimate %}
-              <a class="dropdown-item" href="{% url 'estimate_detail' opportunity.estimate.pk %}">{{ _("View Quotation")}}</a>
+              <a class="dropdown-item" href="{% url 'estimate_detail' request.dealer.slug   opportunity.estimate.pk %}">{{ _("View Quotation")}}</a>
             {% else %}
               <a class="dropdown-item" href="{% url 'estimate_create_from_opportunity' request.dealer.slug opportunity.slug %}">{{ _("Create Quotation")}}</a>
             {% endif %}
@@ -104,7 +104,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>
+                  <a class="dropdown-item" href="{% url 'estimate_detail' request.dealer.slug opportunity.estimate.pk %}">{{ _("View Quotation")}}</a>
                 {% else %}
                   <p>{{ _("No Estimate") }}</p>
                 {% endif %}
diff --git a/templates/crm/opportunities/partials/opportunity_grid.html b/templates/crm/opportunities/partials/opportunity_grid.html
index 6709ab4f..4579e465 100644
--- a/templates/crm/opportunities/partials/opportunity_grid.html
+++ b/templates/crm/opportunities/partials/opportunity_grid.html
@@ -119,7 +119,7 @@
         </div>
 
         <div class="d-flex gap-2">
-          <a class="btn btn-sm btn-phoenix-primary" href="{% url 'opportunity_detail' request.dealer.slug opportunity.slug %}">
+          <a class="btn btn-sm btn-phoenix-primary" href="{% url 'opportunity_detail' request.dealer.slug  opportunity.slug %}">
             {{ _("View Details") }} <i class="fa-solid fa-eye ms-2"></i>
           </a>
           <a class="btn btn-sm btn-phoenix-success" href="{% url 'update_opportunity' request.dealer.slug opportunity.slug %}">
diff --git a/templates/header.html b/templates/header.html
index 143f4342..9e198114 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -78,7 +78,7 @@
                       <li class="nav-item">
                         <a class="nav-link" href="{% url 'estimate_create' request.dealer.slug %}">
                           <div class="d-flex align-items-center">
-                            <span class="nav-link-icon"><span class="fas fa-list-ul"></span></span><span class="nav-link-text">{% trans "create quotation"|capfirst %}</span>
+                            <span class="nav-link-icon"><span class="fas fa-handshake"></span></span><span class="nav-link-text">{% trans "create quotation"|capfirst %}</span>
                           </div>
                         </a>
                       </li>
@@ -87,7 +87,7 @@
                       <li class="nav-item">
                         <a class="nav-link" href="{% url 'estimate_list' request.dealer.slug %}">
                           <div class="d-flex align-items-center">
-                            <span class="nav-link-icon"><span class="fas fa-clipboard-list"></span></span><span class="nav-link-text">{% trans "quotations"|capfirst %}</span>
+                            <span class="nav-link-icon"><span class="fas fa-handshake"></span></span><span class="nav-link-text">{% trans "quotations"|capfirst %}</span>
                           </div>
                         </a>
                       </li>
diff --git a/templates/ledger/bank_accounts/bank_account_list.html b/templates/ledger/bank_accounts/bank_account_list.html
index 9c8187e1..32ca2474 100644
--- a/templates/ledger/bank_accounts/bank_account_list.html
+++ b/templates/ledger/bank_accounts/bank_account_list.html
@@ -8,7 +8,7 @@
 
         <div class="d-flex justify-content-between mb-2">
             <h3 class="">{% trans "Bank Accounts" %}</h3>
-            <a href="{% url 'bank_account_create' %}" class="btn btn-md btn-phoenix-primary"><i class="fa fa-plus me-2"></i>{% trans "Add Bank Account" %}</a>
+            <a href="{% url 'bank_account_create' request.dealer.slug %}" class="btn btn-md btn-phoenix-primary"><i class="fa fa-plus me-2"></i>{% trans "Add Bank Account" %}</a>
         </div>
         {% include "partials/search_box.html" %}
         {% if page_obj.object_list %}
@@ -36,7 +36,7 @@
                                     {{ bank.account_type|capfirst }}
                                 </td>
                                 <td class="align-middle product white-space-nowrap">
-                                    <a href="{% url 'bank_account_update' bank.pk %}"
+                                    <a href="{% url 'bank_account_update' request.dealer.slug bank.pk %}"
                                        class="btn btn-sm btn-phoenix-success">
                                         {% trans "Update" %}
                                     </a>
diff --git a/templates/ledger/coa_accounts/account_detail.html b/templates/ledger/coa_accounts/account_detail.html
index c1082520..92b9ebef 100644
--- a/templates/ledger/coa_accounts/account_detail.html
+++ b/templates/ledger/coa_accounts/account_detail.html
@@ -99,7 +99,7 @@
                       <div class="btn-reveal-trigger position-static">
                         <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
                         <div class="dropdown-menu dropdown-menu-end py-2">
-                          <a class="dropdown-item" href="{% url 'payment_details' request.dealer.slug tx.journal_entry.pk %}">{% trans 'view'|capfirst %}</a>
+                          <a class="dropdown-item text-success-dark" href="{% url 'payment_details' request.dealer.slug tx.journal_entry.pk %}">{% trans 'view Transactions'|capfirst %}</a>
                         </div>
                       </div>
                     </td>
diff --git a/templates/ledger/coa_accounts/partials/account_table.html b/templates/ledger/coa_accounts/partials/account_table.html
index 41638aa6..5f1a0d67 100644
--- a/templates/ledger/coa_accounts/partials/account_table.html
+++ b/templates/ledger/coa_accounts/partials/account_table.html
@@ -39,7 +39,7 @@
                                 <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
                                 <div class="dropdown-menu dropdown-menu-end py-2">
                                     <a href="{% url 'account_detail' request.dealer.slug account.uuid %}" class="dropdown-item text-success-dark">
-                                        {% trans "View" %}
+                                        {% trans "View Journal Entries" %}
                                     </a>
                                     <div class="dropdown-divider"></div>
                                     <button class="dropdown-item text-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">{% trans "Delete" %}</button>
diff --git a/templates/organizations/organization_form.html b/templates/organizations/organization_form.html
index dc69abfa..57edc488 100644
--- a/templates/organizations/organization_form.html
+++ b/templates/organizations/organization_form.html
@@ -12,7 +12,16 @@
 {% block content %}
 
     <div class="container-fluid">
-        <h3>{% trans "Add Organization" %}</h3>
+        <!--Heading-->
+        <h3>
+        {% if object %}
+              {% trans 'Update Organization'%}
+        {% else %}
+              {% trans 'Add New Organization'%}
+        {% endif %}
+        </h3>
+        <!--form body-->
+
         <div class="row mb-3">
             <div class="col-sm-6 col-md-8">
                 <form class="form" method="post" enctype="multipart/form-data">
diff --git a/templates/organizations/organization_list.html b/templates/organizations/organization_list.html
index a225b7e0..df3ab9a7 100644
--- a/templates/organizations/organization_list.html
+++ b/templates/organizations/organization_list.html
@@ -75,7 +75,7 @@
                   <div class="modal-content">
                     <div class="modal-header">
                       <h5 class="modal-title" id="deleteModalLabel">
-                        {% trans 'Delete Vendor' %}
+                        {% trans 'Delete Organization' %}
                         <span data-feather="alert-circle"></span>
                       </h5>
                       <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>