diff --git a/templates/admin_management/management.html b/templates/admin_management/management.html
index 3ce8a5b5..33943c2b 100644
--- a/templates/admin_management/management.html
+++ b/templates/admin_management/management.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-  <h1><i class="fas fa-tools me-2"></i>Admin Management</h1>
+  <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">
     <div class="col">
       <a href="{% url 'user_management' %}">
diff --git a/templates/crm/leads/lead_list.html b/templates/crm/leads/lead_list.html
index ee9c200e..4241ea59 100644
--- a/templates/crm/leads/lead_list.html
+++ b/templates/crm/leads/lead_list.html
@@ -53,8 +53,8 @@
                             </div>
                         </div>
                         <div class="modal-footer">
-                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ _("Close") }}</button>
-                            <button type="submit" class="btn btn-primary">{{ _("Save Changes") }}</button>
+                            <button type="button" class="btn btn-danger" data-bs-dismiss="modal">{{ _("Close") }}</button>
+                            <button type="submit" class="btn btn-success">{{ _("Save Changes") }}</button>
                         </div>
                     </form>
                 </div>
@@ -81,9 +81,9 @@
             <div class="col-12">
                 {% if page_obj.object_list %}
                     <div class="table-responsive scrollbar mx-n1 px-1">
-                        <table class="table fs-9 mb-0 border-top border-translucent">
+                        <table class="table align-items-center table-flush table-hover">
                             <thead>
-                                <tr>
+                                <tr class="bg-body-highlight">
                                     <th class="align-middle white-space-nowrap text-uppercase" scope="col" style="width: 20%;">{{ _("Lead Name")|capfirst }}</th>
                                     <th class="align-middle white-space-nowrap text-uppercase" scope="col" style="width: 15%;">
                                         <div class="d-inline-flex flex-center">
@@ -154,6 +154,7 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <tbody>
                                     <tr class="hover-actions-trigger btn-reveal-trigger position-static">
                                         <td class="name align-middle white-space-nowrap ps-0">
                                             <div class="d-flex align-items-center">
diff --git a/templates/customers/customer_list.html b/templates/customers/customer_list.html
index 196d7aa8..15ecfad9 100644
--- a/templates/customers/customer_list.html
+++ b/templates/customers/customer_list.html
@@ -26,9 +26,9 @@
     {% if page_obj.object_list %}
       <div class="table-responsive scrollbar transition">
 
-        <table class="table table-sm fs-9 mb-0 border-translucent">
+        <table class="table align-items-center table-flush table-hover">
           <thead>
-            <tr>
+            <tr class="bg-body-highlight">
               <th></th>
               <th class="sort white-space-nowrap align-middle text-uppercase ps-0" scope="col" data-sort="name" style="width:25%;">{{ _("Name")|capfirst }}</th>
               <th class="sort align-middle ps-4 pe-5 text-uppercase border-end border-translucent" scope="col" data-sort="email" style="width:15%;">
diff --git a/templates/dealers/dealer_form.html b/templates/dealers/dealer_form.html
index d439ed85..e282ef27 100644
--- a/templates/dealers/dealer_form.html
+++ b/templates/dealers/dealer_form.html
@@ -15,11 +15,11 @@
                 {% csrf_token %}
                 {{ form|crispy }}
                 <div class="gap-2 mt-3">
-                    <button type="submit" class="btn btn-phoenix-primary btn-sm">
+                    <button type="submit" class="btn btn-success btn-sm">
                         <i class="fa fa-save"></i> {{ _("Save") }}
                     </button>
-                    <a href="{% url 'dealer_detail' dealer.pk %}" class="btn btn-sm btn-phoenix-secondary">
-                        <i class="fas fa-times"></i> {{ _("Cancel") }}</a>
+                    <a href="{{request.META.HTTP_REFERER}}" class="btn btn-sm btn-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                    
                 </div>
             </form>
 
diff --git a/templates/groups/group_list.html b/templates/groups/group_list.html
index f67b993f..3ab425bd 100644
--- a/templates/groups/group_list.html
+++ b/templates/groups/group_list.html
@@ -7,7 +7,7 @@
 {% block content %}
     <section class="">
 
-        <div class="row">
+        <div class="row mt-4">
             <div class="col-auto">
                 <div class="d-md-flex justify-content-between">
                     <div>
@@ -16,11 +16,11 @@
                     </div>
                 </div>
             </div>
-            <div class="table-responsive scrollbar mx-n1 px-1">
+            <div class="table-responsive scrollbar mx-n1 px-1 mt-3">
 
-                <table class="table table-hover table-responsive-sm fs-9 mb-0">
+                <table class="table align-items-center table-flush table-hover">
                     <thead>
-                        <tr>
+                        <tr class="bg-body-highlight">
                             <th>{% trans 'name'|capfirst %}</th>
                             <th>{% trans 'total Users'|capfirst %}</th>
                             <th>{% trans 'total permission'|capfirst %}</th>
@@ -30,10 +30,10 @@
                     <tbody>
                         {% for group in groups %}
                             <tr>
-                                <td>{{ group.name }}</td>
-                                <td><i class="fa-solid fa-users"></i> {{ group.users.count }}</td>
-                                <td><i class="fa-solid fa-unlock"></i> {{ group.permissions.count }}</td>
-                                <td>
+                                <td class="align-middle white-space-nowrap ps-1">{{ group.name }}</td>
+                                <td class="align-middle white-space-nowrap"><i class="fa-solid fa-users me-1"></i> {{ group.users.count }}</td>
+                                <td class="align-middle white-space-nowrap"><i class="fa-solid fa-unlock me-1"></i> {{ group.permissions.count }}</td>
+                                <td class="align-middle white-space-nowrap">
                                     <a class="btn btn-phoenix-success"
                                        href="{% url 'group_detail' group.id %}">
                                         <i class="fa-solid fa-eye"></i>
diff --git a/templates/inventory/car_inventory.html b/templates/inventory/car_inventory.html
index f4b6d6f6..f9f451eb 100644
--- a/templates/inventory/car_inventory.html
+++ b/templates/inventory/car_inventory.html
@@ -46,9 +46,9 @@
         <div class="col-sm-12">
             <div class="table-list" id="inventoryTable">
                 <div class="table-responsive scrollbar mb-3">
-                    <table class="table table-sm fs-9 mb-0 overflow-hidden">
+                    <table class="table align-items-center table-flush">
                         <thead class="text-body">
-                            <tr>
+                            <tr class="bg-body-highlight">
                                 <th class="pe-1 align-middle white-space-nowrap text-center" data-sort="stock">{% trans 'Stock'|upper %}</th>
                                 <th class="pe-1 align-middle white-space-nowrap text-start" data-sort="vin" style="min-width: 4.5rem;">{% trans "VIN" %}</th>
                                 <th class="pe-1 align-middle white-space-nowrap text-center" data-sort="date">{% trans "Year"|upper %}</th>
@@ -126,10 +126,15 @@
                     </table>
                 </div>
             </div>
-            <!-- Pagination -->
-            {% if is_paginated %}
-                {% include 'partials/pagination.html' %}
-            {% endif %}
+            <div class="d-flex justify-content-between mt-3"><span class="d-none d-sm-inline-block" data-list-info="data-list-info">{{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }}<span class="text-body-tertiary"> {{ _("Items of")}} </span>{{ page_obj.paginator.count }}</span>
+            <div class="d-flex">
+
+                {% if is_paginated %}
+                    {% include 'partials/pagination.html' %}
+                {% endif %}
+
+            </div>
+        </div>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/inventory/car_list_view.html b/templates/inventory/car_list_view.html
index 2ea19b2d..364e4b6a 100644
--- a/templates/inventory/car_list_view.html
+++ b/templates/inventory/car_list_view.html
@@ -102,18 +102,18 @@
             </div>
 
 
-            <table class="table table-sm fs-9 mb-0 border-translucent">
-              <thead>
-                <tr>
-                  <th class="align-middle ps-1" scope="col">{{ _("VIN") }}</th>
-                  <th class="align-middle" scope="col">{{ _("Make") }}</th>
-                  <th class="align-middle" scope="col">{{ _("Model") }}</th>
-                  <th class="align-middle" scope="col">{{ _("Year") }}</th>
-                  <th class="align-middle" scope="col">{{ _("Trim") }}</th>
-                  <th class="align-middle" scope="col">{{ _("Color") }}</th>
-                  <th class="align-middle" scope="col">{{ _("Age") }}</th>
-                  <th class="align-middle" scope="col">{{ _("Status") }}</th>
-                  <th class="align-middle" scope="col"></th>
+            <table class="table align-items-center table-flush">
+              <thead class="text-body">
+                <tr class="bg-body-highlight">
+                  <th class="sort white-space-nowrap align-middle" scope="col">{{ _("VIN") }}</th>
+                  <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Make") }}</th>
+                  <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Model") }}</th>
+                  <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Year") }}</th>
+                  <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Trim") }}</th>
+                  <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Color") }}</th>
+                  <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Age") }}</th>
+                  <th class="sort white-space-nowrap align-middle" scope="col">{{ _("Status") }}</th>
+                  <th class="sort white-space-nowrap align-middle" scope="col"></th>
                 </tr>
               </thead>
               <tbody class="list" id="project-list-table-body">
@@ -175,7 +175,15 @@
             </table>
           </div>
 
-          {% include 'partials/pagination.html' %}
+         <div class="d-flex justify-content-between mt-3"><span class="d-none d-sm-inline-block" data-list-info="data-list-info">{{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }}<span class="text-body-tertiary"> {{ _("Items of")}} </span>{{ page_obj.paginator.count }}</span>
+            <div class="d-flex">
+
+                {% if is_paginated %}
+                    {% include 'partials/pagination.html' %}
+                {% endif %}
+
+            </div>
+        </div>
 
         </div>
 
diff --git a/templates/organizations/organization_list.html b/templates/organizations/organization_list.html
index 140693f9..63988909 100644
--- a/templates/organizations/organization_list.html
+++ b/templates/organizations/organization_list.html
@@ -39,9 +39,9 @@
       </div>
 
       <div class="table-responsive scrollbar mx-n1 px-1">
-        <table class="table table-hover fs-9 mb-0">
+        <table class="table align-items-center table-flush table-hover">
           <thead>
-            <tr>
+            <tr class="bg-body-highlight">
               <th class="sort white-space-nowrap align-middle text-uppercase ps-0" scope="col" data-sort="name" style="width:25%;">{{ _('Name')|capfirst }}</th>
               <th class="sort align-middle ps-4 pe-5 text-uppercase border-end border-translucent" scope="col" data-sort="name" style="width:15%;">
                 <div class="d-inline-flex flex-center">
@@ -103,9 +103,6 @@
                   <div class="d-flex align-items-center">
                     <div>
                       <a class="fs-8 fw-bold" href="{% url 'organization_detail' org.slug %}">{{ org.name }}</a>
-                      <div class="d-flex align-items-center">
-                        <p class="mb-0 text-body-highlight fw-semibold fs-9 me-2"></p><span class="badge badge-phoenix badge-phoenix-primary">{{ org.name }}</span>
-                      </div>
                     </div>
                   </div>
                 </td>
diff --git a/templates/users/user_list.html b/templates/users/user_list.html
index efa2c984..f673699f 100644
--- a/templates/users/user_list.html
+++ b/templates/users/user_list.html
@@ -7,13 +7,13 @@
 {% block content %}
     <section class="">
 
-        <div class="row">
+        <div class="row mt-4">
             <div class="col-auto">
                 <div class="d-md-flex justify-content-between">
                     <div>
                         {% if request.user.userplan %}
-                            <a href="{% url 'user_create' %}" class="btn btn-sm btn-phoenix-primary"><i class="fa-solid fa-user-tie"></i> {% trans "Add New Staff" %}</a>
-                            <a href="{% url 'group_list' %}" class="btn btn-sm btn-phoenix-success"><i class="fa-solid fa-user-group"></i> {% trans "Manage Groups & Permissions" %}</a>
+                            <a href="{% url 'user_create' %}" class="btn btn-sm btn-phoenix-primary me-4"><i class="fa-solid fa-user-tie me-1"></i> {% trans "Add New Staff" %}</a>
+                            <a href="{% url 'group_list' %}" class="btn btn-sm btn-phoenix-success"><i class="fa-solid fa-user-group me-1"></i> {% trans "Manage Groups & Permissions" %}</a>
                         {% else %}
                             <div class="alert alert-outline-info d-flex align-items-center" role="alert">
                                 <i class="fa-solid fa-circle-info fs-6"></i>
@@ -24,11 +24,11 @@
                     </div>
                 </div>
             </div>
-            <div class="table-responsive scrollbar mx-n1 px-1">
+            <div class="table-responsive scrollbar mx-n1 px-1 mt-3">
 
-                <table class="table table-hover table-responsive-sm fs-9 mb-0">
+                <table class="table align-items-center table-flush table-hover">
                     <thead>
-                        <tr>
+                        <tr class="bg-body-highlight">
                             <th>{% trans 'name'|capfirst %}</th>
                             <th>{% trans 'email'|capfirst %}</th>
                             <th>{% trans 'phone number'|capfirst %}</th>
@@ -39,7 +39,7 @@
                     <tbody>
                         {% for user in users %}
                             <tr>
-                                <td class="align-middle white-space-nowrap ps-0">
+                                <td class="align-middle white-space-nowrap ps-1">
                                     <div>
                                         <a class="fs-8 fw-bold" href="{% url 'user_detail' user.slug%}">{{ user.arabic_name }}</a>
                                         <div class="d-flex align-items-center">