diff --git a/inventory/views.py b/inventory/views.py
index 18785db4..c31a1778 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -3015,7 +3015,7 @@ class OrganizationListView(LoginRequiredMixin, ListView):
     model = models.Organization
     template_name = "organizations/organization_list.html"
     context_object_name = "organizations"
-    paginate_by = 1
+    paginate_by = 20
 
     def get_queryset(self):
         query = self.request.GET.get("q")
diff --git a/templates/csv_upload.html b/templates/csv_upload.html
index 1ea1ba5c..6e223e67 100644
--- a/templates/csv_upload.html
+++ b/templates/csv_upload.html
@@ -75,7 +75,7 @@
     <div class="container mt-4">
         <h2>Upload Cars CSV</h2>
         <div class="d-flex justify-content-end">
-            <a href="{% static 'sample/cars_sample.csv' %}" class="btn btn-outline-success mt-4">
+            <a href="{% static 'sample/cars_sample.csv' %}" class="btn btn-phoenix-success mt-4">
                 <i class="fa-solid fa-file-csv me-2"></i>Download Sample CSV
             </a>
         </div>
@@ -170,8 +170,8 @@
                     {{ _("CSV should include columns: vin")}}
                 </div>
             </div>
-            <button type="submit" class="btn btn-primary">Upload</button>
-            <a href="{{ request.META.HTTP_REFERER }}" class="btn btn-secondary">Cancel</a>
+            <button type="submit" class="btn btn-phoenix-primary mb-2">Upload</button>
+            <a href="{{ request.META.HTTP_REFERER }}" class="btn btn-phoenix-secondary mb-2">Cancel</a>
         </form>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/header.html b/templates/header.html
index 512f6a34..eeb6a35e 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -270,7 +270,7 @@
                           </div>
                         </a>
                       </li>
-                    {% endif %}
+                    {% endif %}  
                   </ul>
                 </div>
               </div>
diff --git a/templates/items/expenses/expenses_list.html b/templates/items/expenses/expenses_list.html
index 5a48a4f7..4f1c69d3 100644
--- a/templates/items/expenses/expenses_list.html
+++ b/templates/items/expenses/expenses_list.html
@@ -29,7 +29,7 @@
                         {% for expense in expenses %}
 
                             <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                                <td class="align-middle product white-space-nowrap">
+                                <td class="align-middle product white-space-nowrap px-1">
                                     {{ expense.item_number }}
                                 </td>
                                 <td class="align-middle product white-space-nowrap">
diff --git a/templates/items/service/service_list.html b/templates/items/service/service_list.html
index 022b1bb2..031c5249 100644
--- a/templates/items/service/service_list.html
+++ b/templates/items/service/service_list.html
@@ -30,7 +30,7 @@
                         {% for service in services %}
 
                             <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                                <td class="align-middle product white-space-nowrap">
+                                <td class="align-middle product white-space-nowrap px-1">
                                     {{ service.pk }}
                                 </td>
                                 <td class="align-middle product white-space-nowrap">
diff --git a/templates/ledger/bank_accounts/bank_account_list.html b/templates/ledger/bank_accounts/bank_account_list.html
index 0edb49eb..331ed4f3 100644
--- a/templates/ledger/bank_accounts/bank_account_list.html
+++ b/templates/ledger/bank_accounts/bank_account_list.html
@@ -26,7 +26,7 @@
                     <tbody class="list">
                         {% for bank in bank_accounts %}
                             <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                                <td class="align-middle product white-space-nowrap">
+                                <td class="align-middle product white-space-nowrap px-1">
                                     {{ bank.name }}
                                 </td>
                                 <td class="align-middle product white-space-nowrap">
diff --git a/templates/ledger/bills/bill_list.html b/templates/ledger/bills/bill_list.html
index 3bda16f8..4b2e5568 100644
--- a/templates/ledger/bills/bill_list.html
+++ b/templates/ledger/bills/bill_list.html
@@ -56,7 +56,7 @@
                     {% for bill in bills %}
 
                         <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                            <td class="align-middle product white-space-nowrap">
+                            <td class="align-middle product white-space-nowrap px-1">
                                 {{ bill.bill_number }}
                             </td>
                             <td class="align-middle product white-space-nowrap">
@@ -81,7 +81,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 href="{% url 'bill-detail' entity_slug=entity.slug bill_pk=bill.pk %}" class="dropdown-item text-success-dark">{% trans 'View' %}</a>
+                                    <a href="{% url 'bill-detail' entity_slug=entity.slug bill_pk=bill.pk %}" class="dropdown-item text-success-dark">{% trans 'View Bill detail' %}</a>
                                 </div>
                             </div>
                         </td>
diff --git a/templates/ledger/coa_accounts/account_detail.html b/templates/ledger/coa_accounts/account_detail.html
index 49d7563f..66010549 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' tx.journal_entry.pk %}">{% trans 'view'|capfirst %}</a>
+                          <a class="dropdown-item text-success" href="{% url 'payment_details' tx.journal_entry.pk %}">{% trans 'View Transacrions'|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 206c2e81..f81348eb 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' 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/ledger/journal_entry/journal_entry_list.html b/templates/ledger/journal_entry/journal_entry_list.html
index 488b1eba..4dfb790c 100644
--- a/templates/ledger/journal_entry/journal_entry_list.html
+++ b/templates/ledger/journal_entry/journal_entry_list.html
@@ -58,7 +58,7 @@
                 <tbody class="list">
                     {% for je in journal_entries %}
                         <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                            <td class="align-middle product white-space-nowrap">{{ je.je_number }}</td>
+                            <td class="align-middle product white-space-nowrap px-1">{{ je.je_number }}</td>
                             <td class="align-middle product white-space-nowrap">{{ je.timestamp }}</td>
                             <td class="align-middle product white-space-nowrap">
                                 {% if je.get_activity_display %}
diff --git a/templates/ledger/ledger/ledger_list.html b/templates/ledger/ledger/ledger_list.html
index 4de53199..82ce253b 100644
--- a/templates/ledger/ledger/ledger_list.html
+++ b/templates/ledger/ledger/ledger_list.html
@@ -30,7 +30,7 @@
                     {% for ledger in ledgers %}
 
                         <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                            <td class="align-middle product white-space-nowrap">
+                            <td class="align-middle product white-space-nowrap px-1">
                                 {% if ledger.invoicemodel %}
                                     <a href="{% url 'invoice_detail' ledger.invoicemodel.pk %}">{{ ledger.get_wrapped_model_instance }}</a>
                                 {% elif ledger.billmodel %}
@@ -89,16 +89,16 @@
                                         {% endif %}
                                         {% if ledger.can_post %}
                                             <a href="{% url 'ledger-action-post' entity_slug=entity_slug ledger_pk=ledger.uuid %}"
-                                               class="dropdown-item has-text-info has-text-weight-bold">{% trans 'Post' %}</a>
+                                               class="dropdown-item has-text-info has-text-weight-bold text-success">{% trans 'Post' %}</a>
                                         {% endif %}
                                         {% if ledger.can_unpost %}
                                             <a href="{% url 'ledger-action-unpost' entity_slug=entity_slug ledger_pk=ledger.uuid %}"
-                                               class="dropdown-item has-text-warning has-text-weight-bold">{% trans 'UnPost' %}</a>
+                                               class="dropdown-item has-text-warning has-text-weight-bold text-info">{% trans 'UnPost' %}</a>
                                         {% endif %}
 
                                         {% if ledger.can_hide %}
                                             <a href="{% url 'ledger-action-hide' entity_slug=entity_slug ledger_pk=ledger.uuid %}"
-                                               class="dropdown-item has-text-warning has-text-weight-bold">{% trans 'Hide' %}</a>
+                                               class="dropdown-item has-text-warning has-text-weight-bold text-danger">{% trans 'Hide' %}</a>
                                         {% endif %}
                                         {% if ledger.can_unhide %}
                                             <a href="{% url 'ledger-action-unhide' entity_slug=entity_slug ledger_pk=ledger.uuid %}"
@@ -107,7 +107,7 @@
 
                                         {% if ledger.can_delete %}
                                             <a href="{% url 'ledger-delete' entity_slug=entity_slug ledger_pk=ledger.uuid %}"
-                                               class="dropdown-item has-text-danger has-text-weight-bold">{% trans 'Delete' %}</a>
+                                               class="dropdown-item has-text-danger has-text-weight-bold text-danger">{% trans 'Delete' %}</a>
                                         {% endif %}
                                     </div>
                                 </div>
diff --git a/templates/organizations/organization_list.html b/templates/organizations/organization_list.html
index dd8d0506..497e6e3a 100644
--- a/templates/organizations/organization_list.html
+++ b/templates/organizations/organization_list.html
@@ -24,17 +24,9 @@
           </div>
         </div>
         <div class="col-auto">
-          <div class="d-flex">
-            <div class="search-box me-2">
-              <form method="get" class="d-inline-block position-relative">
-                <input name="q" class="form-control search-input search" type="search" placeholder="{{ _('Enter Organization name') }}" aria-label="Search" value="{{ request.GET.q }}" />
-                <span class="fas fa-search search-box-icon"></span>
-                {% if request.GET.q %}
-                  <a href="{% url request.resolver_match.view_name %}" class="btn btn-phoenix-danger ms-1"><i class="bi bi-x-lg"></i></a>
-                {% endif %}
-              </form>
+            <div class="d-flex">
+                 {% include 'partials/search_box.html' %}
             </div>
-          </div>
         </div>
       </div>
 
@@ -42,7 +34,7 @@
         <table class="table align-items-center table-flush table-hover">
           <thead>
             <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 white-space-nowrap align-middle text-uppercase ps-0 px-1" 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">
                   <div class="d-flex align-items-center px-1 py-1 bg-success-subtle rounded me-2">
@@ -99,7 +91,7 @@
                 </div>
               </div>
               <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                <td class="name align-middle white-space-nowrap ps-0">
+                <td class="name align-middle white-space-nowrap ps-0 px-1">
                   <div class="d-flex align-items-center">
                     <div>
                       <a class="fs-8 fw-bold" href="{% url 'organization_detail' org.slug %}">{{ org.name }}</a>
@@ -131,16 +123,16 @@
           </tbody>
         </table>
       </div>
-      {% if page_obj.paginator.num_pages > 1 %}
+       {% if page_obj.paginator.num_pages > 1 %}
    
-    <div class="d-flex justify-content-end mt-3">
+          <div class="d-flex justify-content-end mt-3">
        
-            <div class="d-flex">
-                {% include 'partials/pagination.html'%}
-            </div>
+              <div class="d-flex">
+                   {% include 'partials/pagination.html'%}
+               </div>
        
-    </div>
-{% endif %}
+           </div>
+       {% endif %}
     </div>
   </section>
 {% endblock %}
diff --git a/templates/purchase_orders/po_list.html b/templates/purchase_orders/po_list.html
index 6d2f4f9e..0a58786d 100644
--- a/templates/purchase_orders/po_list.html
+++ b/templates/purchase_orders/po_list.html
@@ -67,7 +67,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 href="{% url 'purchase_order_detail' po.pk %}" class="dropdown-item text-success-dark">{% trans 'Detail' %}</a>
+                                            <a href="{% url 'purchase_order_detail' po.pk %}" class="dropdown-item text-success-dark">{% trans 'PO Detail' %}</a>
                                             <a href="{% url 'view_items_inventory' entity_slug=entity_slug po_pk=po.pk %}" class="dropdown-item text-success-dark">{% trans 'View Inventory Items' %}</a>
                                         </div>
                                     </div>
diff --git a/templates/sales/estimates/estimate_list.html b/templates/sales/estimates/estimate_list.html
index 2dc1f67f..eeb5002c 100644
--- a/templates/sales/estimates/estimate_list.html
+++ b/templates/sales/estimates/estimate_list.html
@@ -22,7 +22,7 @@
                 <tbody class="list">
                     {% for estimate in estimates %}
                         <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                            <td class="align-middle product white-space-nowrap py-0">{{ estimate.estimate_number }}</td>
+                            <td class="align-middle product white-space-nowrap py-0 px-1">{{ estimate.estimate_number }}</td>
                             <td class="align-middle product white-space-nowrap">{{ estimate.customer.customer_name }}</td>
                             <td class="align-middle product white-space-nowrap">
                                 {% if estimate.status == 'draft' %}
diff --git a/templates/sales/invoices/invoice_list.html b/templates/sales/invoices/invoice_list.html
index 812a7a6b..dd32f24d 100644
--- a/templates/sales/invoices/invoice_list.html
+++ b/templates/sales/invoices/invoice_list.html
@@ -23,7 +23,7 @@
                 <tbody class="list">
                     {% for invoice in invoices %}
                         <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                            <td class="align-middle product white-space-nowrap py-0">{{ invoice.invoice_number }}</td>
+                            <td class="align-middle product white-space-nowrap py-0 px-1">{{ invoice.invoice_number }}</td>
                             <td class="align-middle product white-space-nowrap">{{ invoice.customer }}</td>
                             <td class="align-middle product white-space-nowrap text-success">
                                 {% if invoice.is_past_due %}
diff --git a/templates/sales/payments/payment_list.html b/templates/sales/payments/payment_list.html
index 99769c6e..b7ffa317 100644
--- a/templates/sales/payments/payment_list.html
+++ b/templates/sales/payments/payment_list.html
@@ -26,7 +26,7 @@
                 <tbody class="list">
                     {% for journal in page_obj %}
                         <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                            <td class="align-middle product white-space-nowrap py-0">{{ forloop.counter }}</td>
+                            <td class="align-middle product white-space-nowrap py-0 px-1">{{ forloop.counter }}</td>
                             <td class="align-middle product white-space-nowrap py-0">{{ journal.je_number }}</td>
                             {% if journal.ledger.invoicemodel %}
                                 <td class="align-middle product white-space-nowrap py-0">
diff --git a/templates/sales/sales_list.html b/templates/sales/sales_list.html
index 2d88831e..faa13279 100644
--- a/templates/sales/sales_list.html
+++ b/templates/sales/sales_list.html
@@ -124,7 +124,7 @@
               <tbody class="list" id="project-list-table-body">
                 {% for tx in txs %}
                   <tr class="position-static">
-                    <td class="align-middle white-space-nowrap customer_name">
+                    <td class="align-middle white-space-nowrap customer_name px-1">
                       <p class="mb-0 fs-9 text-body">{{tx.customer}}</p>
                     </td>
                     <td class="align-middle white-space-nowrap customer_address">
@@ -204,8 +204,7 @@
                     <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" 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 'order_detail' tx.pk %}">{{ _("View") }}</a>
-                          <div class="dropdown-divider"></div><a class="dropdown-item text-danger" href="">{{ _("Remove") }}</a>
+                        <div class="dropdown-menu dropdown-menu-end py-2"><a class="dropdown-item text-success-dark" href="{% url 'order_detail' tx.pk %}">{{ _("View Sales Order Detail") }}</a>
                         </div>
                       </div>
                     </td>
diff --git a/templates/vendors/vendors_list.html b/templates/vendors/vendors_list.html
index bc46fcea..2d679cc8 100644
--- a/templates/vendors/vendors_list.html
+++ b/templates/vendors/vendors_list.html
@@ -79,7 +79,7 @@
                     <tbody class="list">
                         {% for vendor in vendors %}
                             <tr class="hover-actions-trigger btn-reveal-trigger position-static">
-                                <td class="align-middle product white-space-nowrap">
+                                <td class="align-middle product white-space-nowrap px-1">
                                     <div class="d-flex align-items-center">
                                         {% if vendor.logo %}
                                             <div class="avatar avatar-xl me-3">