diff --git a/templates/customers/customer_list.html b/templates/customers/customer_list.html
index e532fd84..5163d5fc 100644
--- a/templates/customers/customer_list.html
+++ b/templates/customers/customer_list.html
@@ -6,7 +6,7 @@
 {% endblock title %}
 {% block vendors %}<a class="nav-link active">{{ _("Customers") |capfirst }}</a>{% endblock %}
 {% block content %}
-{% if customers or request.GET.q%}
+{% if customers or request.GET.q %}
     <div class="row g-3 mt-4">
         <h2 class="mb-2">
             {{ _("Customers") |capfirst }}
diff --git a/templates/ledger/bank_accounts/bank_account_list.html b/templates/ledger/bank_accounts/bank_account_list.html
index ec3badd9..de6aaac3 100644
--- a/templates/ledger/bank_accounts/bank_account_list.html
+++ b/templates/ledger/bank_accounts/bank_account_list.html
@@ -4,7 +4,7 @@
     {{ _("Bank Accounts") }}
 {% endblock title %}
 {% block content %}
-{% if bank_accounts %}
+{% if bank_accounts or request.GET.q%}
     <div class="row mt-4">
         <div class="d-flex justify-content-between mb-2">
             <h3 class="">{% trans "Bank Accounts" %}<span class="fas fa-bank ms-2 text-primary"></span></h3>
diff --git a/templates/message-illustration.html b/templates/message-illustration.html
index 720992ff..edc13595 100644
--- a/templates/message-illustration.html
+++ b/templates/message-illustration.html
@@ -2,38 +2,7 @@
 {% load i18n %}
 
 <style>
-  {% comment %} .empty-state-container {
-        background-color: #ffffff;
-        padding: 50px;
-        border-radius: 5px; /* Rounded corners */
-        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.08); /* Subtle shadow */
-        text-align: center;
-        max-width: 70rem; /* Max width for content - made wider */
-        width: 90%; /* Fluid width */
-        margin: 0px auto; /* Added margin-top and auto for horizontal centering */
-        max-height: 40vh; /* Added min-height to control the height */
-        display: flex; /* Use flexbox for vertical centering of content */
-        flex-direction: column; /* Stack children vertically */
-        justify-content: center; /* Center content vertically */
-        align-items: center; /* Center content horizontally */
-    }
-    .empty-state-image {
-        max-width: 90%; /* Responsive image size */
-        height: 90%;
-
-        border-radius: 10px; /* Rounded corners for image */
-    }
-    .empty-state-title {
-        color: #343a40; /* Dark text for title */
-        font-weight: 600;
-        margin-bottom: 15px;
-    }
-    .empty-state-text {
-        color: #6c757d; /* Muted text for description */
-        margin-bottom: 30px;
-        line-height: 1.6;
-    }
-    /* No specific styles for .btn-add-new or .message-box are needed here as per previous updates */ {% endcomment %}
+ 
 
       .empty-state-container {
         background-color: #ffffff;
diff --git a/templates/sales/estimates/estimate_list.html b/templates/sales/estimates/estimate_list.html
index 9c488ba8..aca6b96d 100644
--- a/templates/sales/estimates/estimate_list.html
+++ b/templates/sales/estimates/estimate_list.html
@@ -4,7 +4,7 @@
     {{ _("Quotations") }}
 {% endblock title %}
 {% block content %}
-{% if estimates %}
+{% if estimates or request.GET.q %}
     <div class="row g-3 mt-4 mb-4">
         <div class="row g-3 justify-content-between mb-4">
             <div class="col-auto">
diff --git a/templates/sales/sales_list.html b/templates/sales/sales_list.html
index c4aa4697..88253e43 100644
--- a/templates/sales/sales_list.html
+++ b/templates/sales/sales_list.html
@@ -4,7 +4,7 @@
 {%block title%} {%trans 'Sale Orders'%} {%endblock%}
 
 {% block content %}
-{% if txs %}
+{% if txs or request.GET.q%}
   <section class="mt-2">
     <div class="row overflow-x-auto whitespace-nowrap -mx-2 sm:mx-0">
       
diff --git a/templates/vendors/vendors_list.html b/templates/vendors/vendors_list.html
index 00cad6a4..215a8c20 100644
--- a/templates/vendors/vendors_list.html
+++ b/templates/vendors/vendors_list.html
@@ -7,7 +7,7 @@
 {% block vendors %}<a class="nav-link active">{{ _("Vendors") |capfirst }}</a>{% endblock %}
 {% block content %}
 
-{% if vendors %}
+{% if vendors or request.GET.q%}
     <div class="row mt-4">
         <div class="d-flex justify-content-between mb-2">
             <h3 class="">