diff --git a/inventory/forms.py b/inventory/forms.py
index faa9fd72..be9e8797 100644
--- a/inventory/forms.py
+++ b/inventory/forms.py
@@ -550,7 +550,7 @@ class CarColorsForm(forms.ModelForm):
         model = CarColors
         fields = ["exterior", "interior"]
 
-        def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs):
             super().__init__(*args, **kwargs)
 
             self.fields["exterior"].queryset = ExteriorColors.objects.all()
diff --git a/inventory/views.py b/inventory/views.py
index f49ab999..37f78936 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -941,6 +941,37 @@ class CarColorCreate(LoginRequiredMixin, PermissionRequiredMixin, CreateView):
         context["car"] = get_object_or_404(models.Car, slug=self.kwargs["slug"])
         return context
 
+class CarColorsUpdateView( LoginRequiredMixin, PermissionRequiredMixin, SuccessMessageMixin, UpdateView):
+    model = models.CarColors
+    form_class = forms.CarColorsForm
+    template_name = "inventory/add_colors.html"
+    success_message = _("Car finance details updated successfully")
+    permission_required = ["inventory.change_carfinance"]
+
+    def get_success_url(self):
+        return reverse("car_detail", kwargs={"slug": self.object.car.slug})
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["instance"] = self.get_object()
+        return kwargs
+
+    def get_initial(self):
+        initial = super().get_initial()
+        instance = self.get_object()
+        dealer = get_user_type(self.request)
+        selected_items = instance.additional_services.filter(dealer=dealer)
+        initial["additional_finances"] = selected_items
+        return initial
+
+    def get_form(self, form_class=None):
+        form = super().get_form(form_class)
+        dealer = get_user_type(self.request)
+        form.fields[
+            "additional_finances"
+        ].queryset = models.AdditionalServices.objects.filter(dealer=dealer)
+        return form
+
 
 class CarListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
     """
diff --git a/templates/account/user_settings.html b/templates/account/user_settings.html
index eec9dfc4..4bb3c987 100644
--- a/templates/account/user_settings.html
+++ b/templates/account/user_settings.html
@@ -2,7 +2,7 @@
 {% load crispy_forms_filters %}
 {% load i18n static %}
 {% load allauth account %}
-{% block head_title %}
+{% block title %}
   {% trans 'User Settings' %}
 {% endblock %}
 {% block content %}
diff --git a/templates/admin_management/management.html b/templates/admin_management/management.html
index 33943c2b..65c612d4 100644
--- a/templates/admin_management/management.html
+++ b/templates/admin_management/management.html
@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% load i18n %}
+{%block title%} {%trans 'Admin Management' %}  {%endblock%}
 {% block content %}
   <h1 class="mt-4"><i class="fas fa-tools me-2"></i>Admin Management</h1>
   <div class="row row-cols-1 row-cols-md-4 g-4 mt-10">
diff --git a/templates/crm/leads/lead_form.html b/templates/crm/leads/lead_form.html
index ee7eb3bf..26e8e432 100644
--- a/templates/crm/leads/lead_form.html
+++ b/templates/crm/leads/lead_form.html
@@ -1,5 +1,13 @@
 {% extends 'base.html' %}
 {% load i18n static crispy_forms_filters %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Lead'%}
+    {% else %}
+         {% trans 'Add New Lead'%}
+    {% endif %}
+{% endblock %}
 {% block customcss %}
     <style>
         .htmx-indicator{
diff --git a/templates/crm/leads/lead_tracking.html b/templates/crm/leads/lead_tracking.html
index ec68c50b..5b470d0f 100644
--- a/templates/crm/leads/lead_tracking.html
+++ b/templates/crm/leads/lead_tracking.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n static %}
-{% block title %}{{ _('Leads')|capfirst }}{% endblock title %}
+{% block title %}{{ _('Leads Tracking')|capfirst }}{% endblock title %}
 
 {% block customCSS %}
   <style>
diff --git a/templates/crm/opportunities/opportunity_detail.html b/templates/crm/opportunities/opportunity_detail.html
index d2c866d6..27d4287c 100644
--- a/templates/crm/opportunities/opportunity_detail.html
+++ b/templates/crm/opportunities/opportunity_detail.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n static humanize %}
-
+{% block title %}{{ _("Opportunity Detail") }}{% endblock title %}
 {% block content %}
   <div class="row align-items-center justify-content-between g-3 mb-4">
     <div class="col-12 col-md-auto">
diff --git a/templates/crm/opportunities/opportunity_form.html b/templates/crm/opportunities/opportunity_form.html
index f4cd3815..a7fd8cb2 100644
--- a/templates/crm/opportunities/opportunity_form.html
+++ b/templates/crm/opportunities/opportunity_form.html
@@ -1,6 +1,13 @@
 {% extends 'base.html' %}
 {% load i18n static widget_tweaks custom_filters %}
-
+ {% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Opportunity'%}
+    {% else %}
+         {% trans 'Add New Opportunity'%}
+    {% endif %}
+{% endblock %}
 {% block content %}
   <div class="container-fluid">
     <div class="row g-3 mb-4 align-items-center">
diff --git a/templates/crm/opportunities/opportunity_list.html b/templates/crm/opportunities/opportunity_list.html
index 3454e203..c815e514 100644
--- a/templates/crm/opportunities/opportunity_list.html
+++ b/templates/crm/opportunities/opportunity_list.html
@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 {% load i18n static humanize %}
 {% load custom_filters %}
-
+{% block title %}{{ _("Opportunities") }}{% endblock title %}
 {% block content %}
   <div class="row g-3">
     <div class="col-12">
diff --git a/templates/customers/customer_form.html b/templates/customers/customer_form.html
index b234d722..b4560dc2 100644
--- a/templates/customers/customer_form.html
+++ b/templates/customers/customer_form.html
@@ -1,8 +1,14 @@
 {% extends "base.html" %}
 {% load i18n static%}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "Customers" %}{% endblock title %}
-
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Customer'%}
+    {% else %}
+         {% trans 'Add New Customer'%}
+    {% endif %}
+{% endblock %}
 {% block content %}
 
     <link rel="stylesheet" href="{% static 'flags/sprite.css' %}">
diff --git a/templates/dealers/activity_log.html b/templates/dealers/activity_log.html
index 80294ee4..7f6f16e1 100644
--- a/templates/dealers/activity_log.html
+++ b/templates/dealers/activity_log.html
@@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n static %}
+{%block title%}{% trans 'Activity'%}{%endblock%}
 {% block content %}
     <div class="row">
         <div class="ol-auto pt-5 pb-9">
diff --git a/templates/dealers/assign_car_makes.html b/templates/dealers/assign_car_makes.html
index c9ad5b84..ad4a521f 100644
--- a/templates/dealers/assign_car_makes.html
+++ b/templates/dealers/assign_car_makes.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
-{% load static %}
-
+{% load i18n static %}
+{%block title%} {% trans  'Car Makes'%}{%endblock%}
 {% block content %}
     <style>
         /* Your existing CSS styles here */
diff --git a/templates/dealers/dealer_detail.html b/templates/dealers/dealer_detail.html
index 7a85149e..2181b079 100644
--- a/templates/dealers/dealer_detail.html
+++ b/templates/dealers/dealer_detail.html
@@ -1,4 +1,7 @@
-{% extends 'base.html' %} {% load i18n static custom_filters%} {% block content %}
+{% extends 'base.html' %} 
+{% load i18n static custom_filters%}
+{%block title%}{%trans 'Profile'%} {%endblock%}
+{% block content %}
     <div class="container-fluid">
         <div class="row align-items-center justify-content-between g-3 mb-4">
             <div class="col-auto">
diff --git a/templates/groups/group_form.html b/templates/groups/group_form.html
index 2f6639c8..28451559 100644
--- a/templates/groups/group_form.html
+++ b/templates/groups/group_form.html
@@ -1,7 +1,14 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "Group" %}{% endblock title %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Group'%}
+    {% else %}
+         {% trans 'Add New Group'%}
+    {% endif %}
+{% endblock %}
 
 {% block content %}
 
diff --git a/templates/groups/group_list.html b/templates/groups/group_list.html
index 3ab425bd..8b36797e 100644
--- a/templates/groups/group_list.html
+++ b/templates/groups/group_list.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load render_table from django_tables2 %}
 
-{% block title %}{% trans "Group" %}{% endblock title %}
+{% block title %}{% trans "Groups" %}{% endblock title %}
 
 {% block content %}
     <section class="">
diff --git a/templates/inventory/car_detail.html b/templates/inventory/car_detail.html
index 3637fe11..261dfcd9 100644
--- a/templates/inventory/car_detail.html
+++ b/templates/inventory/car_detail.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+ {% extends 'base.html' %}
 {% load i18n static custom_filters %}
 {% block title %}{{ _("Car Details") }}{% endblock %}
 {% block customCSS %}
@@ -14,7 +14,8 @@
       transform: translate(-50%, -50%);
     }
     </style>
-{% endblock customCSS %}
+{% endblock customCSS %}                
+
 {% block content %}
     {% if not car.ready %}
         <div class="alert alert-outline-warning d-flex align-items-center"
@@ -305,8 +306,24 @@
                                                  style="background-color: rgb({{ car.colors.interior.rgb }})"></div>
                                         </td>
                                     </tr>
-                                {% else %}
+                                    
                                     <tr>
+                                        <td colspan="2">
+                                            {% comment %} {% if not car.get_transfer %}
+                                                <a href="{% url 'car_finance_update' car.finances.pk %}"
+                                                   class="btn btn-phoenix-warning btn-sm mb-3">{% trans "Edit" %}</a>
+                                            {% else %}
+                                                <span class="badge bg-danger">{% trans "Cannot Edit, Car in Transfer." %}</span>
+                                            {% endif %}
+                                        {% else %}
+                                            <p>{% trans "No finance details available." %}</p>
+                                            {% if perms.inventory.add_carfinance %}
+                                                <a href="{% url 'car_finance_create' car.slug %}"
+                                                   class="btn btn-phoenix-success btn-sm mb-3">{% trans "Add" %}</a>
+                                            {% endif %} {% endcomment %}
+                                        </td>
+                                    </tr>
+                                    {% comment %} <tr>
                                         <td colspan="2">{% trans "No colors available for this car." %}</td>
                                     </tr>
                                     <tr>
@@ -316,7 +333,7 @@
                                                    class="btn btn-phoenix-success btn-sm">{% trans "Add" %}</a>
                                             {% endif %}
                                         </td>
-                                    </tr>
+                                    </tr> {% endcomment %}
                                 {% endif %}
                             </table>
                         </div>
diff --git a/templates/inventory/car_form.html b/templates/inventory/car_form.html
index fe27d901..078e92bf 100644
--- a/templates/inventory/car_form.html
+++ b/templates/inventory/car_form.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n static custom_filters %}
+{%block title%} {%trans 'Add New Car'%} {%endblock%}
 {% block content %}
     <style>
     #video {
diff --git a/templates/inventory/car_list.html b/templates/inventory/car_list.html
index caa9247e..32858e3e 100644
--- a/templates/inventory/car_list.html
+++ b/templates/inventory/car_list.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load custom_filters %}
+
 {% block content %}
     <div class="row-fluid p-2">
         <!-- Display Validation Errors -->
diff --git a/templates/inventory/car_list_view.html b/templates/inventory/car_list_view.html
index 30262dbc..c967a7f3 100644
--- a/templates/inventory/car_list_view.html
+++ b/templates/inventory/car_list_view.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n custom_filters humanize %}
+{%block title%} {%trans 'Stocks'%} {%endblock%}
 {% block customCSS %}
     <style>
     .htmx-indicator{
@@ -167,6 +168,7 @@
                                     <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Color") }}</th>
                                     <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Date Received") }}</th>
                                     <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Status") }}</th>
+                                    <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Inventory Ready") }}</th>
                                     <th class="sort white-space-nowrap align-middle" scope="col"></th>
                                 </tr>
                             </thead>
@@ -216,6 +218,13 @@
                                                 <span class="badge badge-phoenix fs-11 badge-phoenix-warning">{{ _("Transfer") }}</span>
                                             {% endif %}
                                         </td>
+                                        <td class="align-middle product white-space-nowrap">
+                                            {% if not car.ready %}
+                                              <span class="text-danger"> {{ _("NO") }} </span>
+                                            {%else%}
+                                               <span class="text-success"> {{ _("YES") }} </span>
+                                            {%endif%}
+                                        </td>
                                         <td class="align-middle text-end white-space-nowrap pe-0 action">
                                             <div class="btn-reveal-trigger position-static">
                                                 <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal fs-10"
diff --git a/templates/items/expenses/expense_create.html b/templates/items/expenses/expense_create.html
index e357f73a..3f79e271 100644
--- a/templates/items/expenses/expense_create.html
+++ b/templates/items/expenses/expense_create.html
@@ -2,7 +2,7 @@
 {% load crispy_forms_filters %}
 {% load static %}
 {% load i18n %}
-{% block title %}{{ _("Expenses") }}{% endblock title %}
+{% block title %}{{ _("Add New Expense") }}{% endblock title %}
 {% block content %}
     <div class="row">
         <div class="row justify-content-center">
diff --git a/templates/items/expenses/expense_update.html b/templates/items/expenses/expense_update.html
index 338db296..db7a1343 100644
--- a/templates/items/expenses/expense_update.html
+++ b/templates/items/expenses/expense_update.html
@@ -2,7 +2,7 @@
 {% load crispy_forms_filters %}
 {% load static %}
 {% load i18n %}
-{% block title %}{{ _("Expenses") }}{% endblock title %}
+{% block title %}{{ _("Update Expense") }}{% endblock title %}
 {% block content %}
     <div class="row">
         <div class="row justify-content-center">
diff --git a/templates/items/service/service_create.html b/templates/items/service/service_create.html
index 8e45f24c..44d58317 100644
--- a/templates/items/service/service_create.html
+++ b/templates/items/service/service_create.html
@@ -2,7 +2,16 @@
 {% load crispy_forms_filters %}
 {% load static %}
 {% load i18n %}
-{% block title %}{{ _("Service") }}{% endblock title %}
+
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Service'%}
+    {% else %}
+         {% trans 'Add New Service'%}
+    {% endif %}
+{% endblock %}
+
 {% block content %}
     <div class="container">
         <div class="row justify-content-center">
diff --git a/templates/ledger/bank_accounts/bank_account_form.html b/templates/ledger/bank_accounts/bank_account_form.html
index 337172df..54324645 100644
--- a/templates/ledger/bank_accounts/bank_account_form.html
+++ b/templates/ledger/bank_accounts/bank_account_form.html
@@ -1,7 +1,15 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "bank account" %}{% endblock title %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Bank Account'%}
+    {% else %}
+         {% trans 'Add New Bank Account'%}
+    {% endif %}
+{% endblock %}
+
 
 {% block content %}
     <div class="container">
diff --git a/templates/ledger/coa_accounts/account_form.html b/templates/ledger/coa_accounts/account_form.html
index 57bd62ad..7a6fea3b 100644
--- a/templates/ledger/coa_accounts/account_form.html
+++ b/templates/ledger/coa_accounts/account_form.html
@@ -1,7 +1,15 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "account" %}{% endblock title %}
+
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Account'%}
+    {% else %}
+         {% trans 'Add New Account'%}
+    {% endif %}
+{% endblock %}
 
 {% block content %}
     <div class="row my-5">
diff --git a/templates/ledger/reports/balance_sheet.html b/templates/ledger/reports/balance_sheet.html
index 78f5de39..89e30462 100644
--- a/templates/ledger/reports/balance_sheet.html
+++ b/templates/ledger/reports/balance_sheet.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 {% load custom_filters %}
-
+{%block title%}{%trans 'Balance Sheet'%} {%endblock%}
 
 {% block period_navigation %}
     {% if entity %}
diff --git a/templates/ledger/reports/cash_flow_statement.html b/templates/ledger/reports/cash_flow_statement.html
index 388e31fd..9ad1f5e8 100644
--- a/templates/ledger/reports/cash_flow_statement.html
+++ b/templates/ledger/reports/cash_flow_statement.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 {% load custom_filters %}
-
+{%block title%}{%trans 'Cash Flow Statement'%} {%endblock%}
 {% block period_navigation %}
     {% if unit_model and entity %}
         <div class="col-12">{% period_navigation 'unit-cf' %}</div>
diff --git a/templates/ledger/reports/income_statement.html b/templates/ledger/reports/income_statement.html
index bfd51d56..398befec 100644
--- a/templates/ledger/reports/income_statement.html
+++ b/templates/ledger/reports/income_statement.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 {% load custom_filters %}
-
+{%block title%}{%trans 'Income Statement'%} {%endblock%}
 {% block period_navigation %}
     {% if unit_model %}
         <div class="col-12">{% period_navigation 'unit-ic' %}</div>
diff --git a/templates/organizations/organization_form.html b/templates/organizations/organization_form.html
index 18735536..7efa1b2c 100644
--- a/templates/organizations/organization_form.html
+++ b/templates/organizations/organization_form.html
@@ -1,7 +1,14 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "Add Organization" %}{% endblock title %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Organization'%}
+    {% else %}
+         {% trans 'Add New Organization'%}
+    {% endif %}
+{% endblock %}
 {% block content %}
 
     <div class="container-fluid">
diff --git a/templates/plans/billing_info_create_or_update.html b/templates/plans/billing_info_create_or_update.html
index 5dc24465..c1aadfa0 100644
--- a/templates/plans/billing_info_create_or_update.html
+++ b/templates/plans/billing_info_create_or_update.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n crispy_forms_filters %}
-
+{%block title%} {% trans  'Billing Information'%}{%endblock%}
 
 {% block content %}
     <div class="row mb-3">
diff --git a/templates/plans/invoices/layout.html b/templates/plans/invoices/layout.html
index 39e53904..67890de1 100644
--- a/templates/plans/invoices/layout.html
+++ b/templates/plans/invoices/layout.html
@@ -95,9 +95,9 @@
     <div class="card-body p-0">
       <div class="table-responsive" style="overflow-x: auto;">
         <div style="min-width: 800px;"> <!-- Minimum width to ensure scrolling on smaller screens -->
-          <table class="table table-hover mb-0">
+          <table class="table align-items-center table-flush table-hover">
             <thead class="">
-              <tr>
+              <tr class="bg-body-highlight">
                 <th class="text-center sticky-col" style="width: 5%; z-index: 1;">#</th>
                 <th style="width: 25%; min-width: 200px;">{{ _("Description") }}</th>
                 <th class="text-end" style="width: 10%; min-width: 100px;">{{ _("Unit Price")}}</th>
@@ -109,7 +109,7 @@
                 <th class="text-end" style="width: 10%; min-width: 100px;">{{ _("Subtotal") }}</th>
                 <th class="text-center" style="width: 8%; min-width: 80px;">{{ _("VAT") }}</th>
                 <th class="text-end" style="width: 10%; min-width: 100px;">{{ _("VAT Amount")}}</th>
-                <th class="text-end" style="width: 10%; min-width: 100px;">{{ _("Total") }}</th>
+                <th class="text-center" style="width: 10%; min-width: 100px;">{{ _("Total") }}</th>
               </tr>
             </thead>
             <tbody>
@@ -125,7 +125,7 @@
                 <td class="text-end">{{ invoice.total_net|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
                 <td class="text-center">{% if invoice.tax != None %}{{ invoice.tax|floatformat }}%{% else %}n/a{% endif %}</td>
                 <td class="text-end">{% if invoice.tax_total != None %}{{ invoice.tax_total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span>{% else %}{{ _("n/a")}}{% endif %}</td>
-                <td class="text-end fw-bold">{{ invoice.total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
+                <td class="text-center fw-bold">{{ invoice.total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
               </tr>
             </tbody>
             <tfoot class="">
@@ -134,7 +134,7 @@
                 <td class="text-end fw-bold">{{ invoice.total_net|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
                 <td class="text-center fw-bold">{% if invoice.tax != None %}{{ invoice.tax|floatformat }}%{% else %}{{ _("n/a")}}{% endif %}</td>
                 <td class="text-end fw-bold">{% if invoice.tax_total != None %}{{ invoice.tax_total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span>{% else %}{{ _("n/a")}}{% endif %}</td>
-                <td class="text-end fw-bold text-primary">{{ invoice.total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
+                <td class="text-center fw-bold text-primary">{{ invoice.total|floatformat:2 }} <span class="currency">{{ CURRENCY }}</span></td>
               </tr>
             </tfoot>
           </table>
diff --git a/templates/plans/order_detail.html b/templates/plans/order_detail.html
index 1e7e77f9..e0835a75 100644
--- a/templates/plans/order_detail.html
+++ b/templates/plans/order_detail.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-
+{%block title%}{%trans 'Order Details'%} {%endblock%}
 
 {% block head %}
     <script>
@@ -15,7 +15,7 @@
 
 
 {% block body %}
-    <h1>{% blocktrans with object.id as order_id and object.get_status_display as order_status %}Order #{{ order_id }}
+    <h1 class="mt-4">{% blocktrans with object.id as order_id and object.get_status_display as order_status %}Order #{{ order_id }}
         (status: {{ order_status }}){% endblocktrans %}</h1>
 
     {# You should provide displaying django messages in this template #}
@@ -25,7 +25,7 @@
     {% endwith %}
 
     {% if object.get_all_invoices.count %}
-        <h2>{% trans "Printable documents" %}</h2>
+        <h2 class="mt-3">{% trans "Printable documents" %}</h2>
         <ul id="order_printable_documents">
             {% for invoice in object.get_all_invoices %}
                 <li><a href="{{ invoice.get_absolute_url }}"
@@ -37,10 +37,10 @@
 
 
 
-    <h2>{% trans "Payment" %}</h2>
+    <h2 class="mt-3">{% trans "Payment" %}</h2>
     {% if object.completed %}
 
-        <p class="alert alert-phoenix-success">
+        <p class="alert alert-phoenix-success mt-2">
             {% blocktrans with  object.completed as completed %}
                 Payment completed on: {{ completed }}
             {% endblocktrans %}
@@ -50,7 +50,7 @@
         {% if object.is_ready_for_payment %}
             {% block payment_method %}
 
-                <p>
+                <p class="mt-2">
                     Here should go bindings to your payment. We recommend using <a
                         href="https://github.com/cypreess/django-getpaid">django-getpaid</a> for payment processing.
                     Use a fake payment below to simulate paying for an order:
@@ -72,7 +72,7 @@
             {% endblock %}
         {% else %}
 
-            <p class="alert alert-phoenix-warning">
+            <p class="alert alert-phoenix-warning mt-2">
                 {% blocktrans %}
                     This order is expired. It will accept an incoming payment made earlier, but new payment cannot be
                     initialized. Please make a new order if necessary.
diff --git a/templates/plans/order_detail_table.html b/templates/plans/order_detail_table.html
index cdd52d1b..8d7db086 100644
--- a/templates/plans/order_detail_table.html
+++ b/templates/plans/order_detail_table.html
@@ -1,32 +1,32 @@
 {% load i18n %}
 
 {% block table %}
-  <div class="table-responsive px-1 scrollbar">
-    <table class="table fs-9 mb-0 border-top border-translucent">
+  <div class="table-responsive px-1 scrollbar mt-3">
+    <table class="table align-items-center table-flush table-hover">
       <thead>
-        <tr>
-          <th>{% trans "Name" %}</th>
-          <th>{% trans "Net price" %}</th>
-          <th>{% trans "VAT" %}</th>
-          <th>{% trans "VAT total" %}</th>
-          <th>{% trans "Total" %}</th>
-          <th>{% trans "Order completed" %}</th>
+        <tr class="bg-body-highlight">
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Name" %}</th>
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Net price" %}</th>
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "VAT" %}</th>
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "VAT total" %}</th>
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Total" %}</th>
+          <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Order completed" %}</th>
           {% if order.user %}
-            <th>{% trans "Plan valid from" %}</th>
-            <th>{% trans "Plan valid until" %}</th>
+            <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Plan valid from" %}</th>
+            <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Plan valid until" %}</th>
           {% endif %}
         </tr>
       </thead>
       <tbody>
         <tr>
-          <td>{{ order.name }}</td>
-          <td>{{ order.amount }} {{ order.currency }}</td>
-          <td>{% if order.tax == None %}n/a{% else %}{{ order.tax }} %{% endif %}</td>
-          <td>{% if order.tax_total == None %}n/a{% else %}{{ order.tax_total }} {{ order.currency }}{% endif %}</td>
-          <td class="number total">{{ order.total }} {{ order.currency }}</td>
-          <td class="date">{{ order.completed|date|default:"-" }}</td>
-          <td class="date">{{ order.get_plan_extended_from|date|default:"-" }}</td>
-          <td class="date">{{ order.get_plan_extended_until|date|default:"-" }}</td>
+          <td class="align-middle product white-space-nowrap">{{ order.name }}</td>
+          <td class="align-middle product white-space-nowrap">{{ order.amount }} {{ order.currency }}</td>
+          <td class="align-middle product white-space-nowrap">{% if order.tax == None %}n/a{% else %}{{ order.tax }} %{% endif %}</td>
+          <td class="align-middle product white-space-nowrap">{% if order.tax_total == None %}n/a{% else %}{{ order.tax_total }} {{ order.currency }}{% endif %}</td>
+          <td class="number total align-middle product white-space-nowrap">{{ order.total }} {{ order.currency }}</td>
+          <td class="date align-middle product white-space-nowrap">{{ order.completed|date|default:"-" }}</td>
+          <td class="date align-middle product white-space-nowrap">{{ order.get_plan_extended_from|date|default:"-" }}</td>
+          <td class="date align-middle product white-space-nowrap">{{ order.get_plan_extended_until|date|default:"-" }}</td>
         </tr>
       </tbody>
     </table>
diff --git a/templates/plans/order_list.html b/templates/plans/order_list.html
index 98d8ad98..5f948142 100644
--- a/templates/plans/order_list.html
+++ b/templates/plans/order_list.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n %}
-
+{%block title%}{%trans 'Plans Orders'%} {%endblock%}
 
 {% block body %}
     {% block order_header %}
diff --git a/templates/pricing_page.html b/templates/pricing_page.html
index 7b5e78fe..99414ade 100644
--- a/templates/pricing_page.html
+++ b/templates/pricing_page.html
@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load i18n static %}
 {% load custom_filters %}
+{%block title%} {% trans 'Upgrade Plan' %} {%endblock%}
 
 {% block customCSS %}
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css" integrity="sha512-X..." crossorigin="anonymous" referrerpolicy="no-referrer" />
diff --git a/templates/sales/invoices/invoice_detail.html b/templates/sales/invoices/invoice_detail.html
index aee7b6f8..cbff62b4 100644
--- a/templates/sales/invoices/invoice_detail.html
+++ b/templates/sales/invoices/invoice_detail.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load tenhal_tag %}
 
-{% block title %}{{ _("View Estimate") }}{% endblock title %}
+{% block title %}{{ _("View Invoice") }}{% endblock title %}
 {% block customCSS %}
   <style>
     .disabled{
diff --git a/templates/sales/sales_list.html b/templates/sales/sales_list.html
index 016918a5..742b767d 100644
--- a/templates/sales/sales_list.html
+++ b/templates/sales/sales_list.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load custom_filters %}
+{%block title%} {%trans 'Sales'%} {%endblock%}
 
 {% block customCSS %}
   <style>
diff --git a/templates/users/user_form.html b/templates/users/user_form.html
index 84880a6f..4c868370 100644
--- a/templates/users/user_form.html
+++ b/templates/users/user_form.html
@@ -1,7 +1,14 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "Staff" %}{% endblock title %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Staff'%}
+    {% else %}
+         {% trans 'Add New Staff'%}
+    {% endif %}
+{% endblock %}
 
 {% block content %}
 
diff --git a/templates/users/user_list.html b/templates/users/user_list.html
index 06360a55..688dd325 100644
--- a/templates/users/user_list.html
+++ b/templates/users/user_list.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load render_table from django_tables2 %}
 
-{% block title %}{% trans "Staff" %}{% endblock title %}
+{% block title %}{% trans "Staffs" %}{% endblock title %}
 
 {% block content %}
     <section class="">
diff --git a/templates/vendors/vendor_form.html b/templates/vendors/vendor_form.html
index a4527aa7..d728606a 100644
--- a/templates/vendors/vendor_form.html
+++ b/templates/vendors/vendor_form.html
@@ -1,7 +1,15 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load crispy_forms_filters %}
-{% block title %}{% trans "Vendors" %}{% endblock title %}
+{% block title %}
+    {# Check if an 'object'  exists in the context #}
+    {% if object %}
+       {% trans 'Update Vendor'%}
+    {% else %}
+         {% trans 'Add New Vendor'%}
+    {% endif %}
+{% endblock %}
+
 
 {% block content %}