diff --git a/templates/meetings/list_meetings.html b/templates/meetings/list_meetings.html
index c0a2972..391bdd9 100644
--- a/templates/meetings/list_meetings.html
+++ b/templates/meetings/list_meetings.html
@@ -40,8 +40,7 @@
         transition: all 0.2s ease;
         display: inline-flex;
         align-items: center;
-        gap: 0.4rem;
-        padding: 0.5rem 1rem;
+        gap: 0.25rem;
     }
 
     .btn-main-action:hover {
@@ -209,7 +208,7 @@
                             <label for="candidate_name" class="form-label small text-muted">{% trans "Candidate Name" %}</label>
                             <input type="text" class="form-control form-control-sm" id="candidate_name" name="candidate_name" placeholder="{% trans 'Search by candidate...' %}" value="{{ candidate_name_filter }}">
                         </div>
-                        <div class="col-md-5">
+                        <div class="col-md-4">
                             <div class="filter-buttons">
                                 <button type="submit" class="btn btn-main-action btn-sm">
                                     <i class="fas fa-filter me-1"></i> {% trans "Apply Filters" %}
diff --git a/templates/participants/participants_list.html b/templates/participants/participants_list.html
index 498fd8d..407e66a 100644
--- a/templates/participants/participants_list.html
+++ b/templates/participants/participants_list.html
@@ -39,7 +39,8 @@
     }
 
     /* Main Action Button Style (Teal Theme) */
-    .btn-main-action {
+   
+     .btn-main-action {
         background-color: var(--kaauh-teal);
         border-color: var(--kaauh-teal);
         color: white;
@@ -47,8 +48,7 @@
         transition: all 0.2s ease;
         display: inline-flex;
         align-items: center;
-        gap: 0.4rem;
-        padding: 0.5rem 1rem;
+        gap: 0.25rem;
     }
 
     .btn-main-action:hover {
@@ -168,7 +168,7 @@
                     <form method="GET" class="row g-3 align-items-end h-100">
                         {% if search_query %}<input type="hidden" name="q" value="{{ search_query }}">{% endif %}
 
-                            <div class="col-md-8">
+                            <div class="col-md-4">
                                 <label for="job_filter" class="form-label small text-muted">{% trans "Filter by Assigned Job" %}</label>
                                 <select name="job" id="job_filter" class="form-select form-select-sm">
                                     <option value="">{% trans "All Jobs" %}</option>
@@ -180,10 +180,10 @@
                             </div>
 
                         {# Buttons Group (pushed to the right/bottom) #}
-                        <div class="col-md-4 d-flex justify-content-end align-self-end">
+                        <div class="col-md-4 d-flex">
                             <div class="filter-buttons">
                                 <button type="submit" class="btn btn-main-action btn-sm">
-                                    <i class="fas fa-filter me-1"></i> {% trans "Apply" %}
+                                    <i class="fas fa-filter me-1"></i> {% trans "Apply Filters" %}
                                 </button>
                                 {% if job_filter or search_query %}
                                     <a href="{% url 'participant_list' %}" class="btn btn-outline-secondary btn-sm">
diff --git a/templates/recruitment/agency_list.html b/templates/recruitment/agency_list.html
index 904c53e..20ca90c 100644
--- a/templates/recruitment/agency_list.html
+++ b/templates/recruitment/agency_list.html
@@ -147,28 +147,23 @@
         </div>
     </div>
 
-    <!-- Search Form -->
-    <div class="search-form">
-        <form method="get" class="row g-3">
-            <div class="col-md-10">
-                <div class="input-group">
-                    <span class="input-group-text">
-                        <i class="fas fa-search"></i>
-                    </span>
-                    <input type="text"
-                           name="q"
-                           class="form-control"
-                           placeholder="{% trans 'Search by name, contact person, email, or country...' %}"
-                           value="{{ search_query }}">
+  
+<div class="card mb-4 shadow-sm no-hover">
+    <div class="card-body">
+        <div class="row g-4">
+            <div class="col-md-6">
+                <label for="search" class="form-label small text-muted">{% trans "Search by name, contact person, email, or country..." %}</label>
+                <div class="input-group input-group-lg">
+                    <form method="get" action="" class="w-100">
+                        {% include 'includes/search_form.html' %}
+                    </form>
                 </div>
             </div>
-            <div class="col-md-1">
-                <button type="submit" class="btn btn-main-action w-100">
-                    <i class="fas fa-search me-1"></i> {% trans "Search" %}
-                </button>
-            </div>
-        </form>
+
+            
+        </div>
     </div>
+</div>
 
     <!-- Agencies List -->
     {% if page_obj %}
diff --git a/templates/recruitment/candidate_list.html b/templates/recruitment/candidate_list.html
index efb3acd..5ffafb6 100644
--- a/templates/recruitment/candidate_list.html
+++ b/templates/recruitment/candidate_list.html
@@ -39,7 +39,7 @@
     }
 
     /* Main Action Button Style (Teal Theme) */
-    .btn-main-action {
+     .btn-main-action {
         background-color: var(--kaauh-teal);
         border-color: var(--kaauh-teal);
         color: white;
@@ -47,8 +47,7 @@
         transition: all 0.2s ease;
         display: inline-flex;
         align-items: center;
-        gap: 0.4rem;
-        padding: 0.5rem 1rem;
+        gap: 0.25rem;
     }
 
     .btn-main-action:hover {
@@ -226,6 +225,14 @@
                                     <option value="{{ job.slug }}" {% if job_filter == job.slug %}selected{% endif %}>{{ job.title }}</option>
                                     {% endfor %}
                             </select>
+                            
+                            </div>
+                        </div>
+
+                        <div class="col-md-4">
+                            <label for="job_filter" class="form-label small text-muted">{% trans "Filter by Stages" %}</label>
+                            <div class="d-flex gap-2">
+                               
                             <select name="stage" id="stage_filter" class="form-select form-select-sm">
                                 <option value="">{% trans "All Stages" %}</option>
                                     <option value="Applied" {% if stage_filter == 'Applied' %}selected{% endif %}>{% trans "Applied" %}</option>
@@ -237,10 +244,10 @@
                         </div>
 
                     {# Buttons Group (pushed to the right/bottom) #}
-                    <div class="col-md-4 d-flex justify-content-end align-self-end">
+                    <div class="col-md-4 d-flex ">
                         <div class="filter-buttons">
                             <button type="submit" class="btn btn-main-action btn-sm">
-                                <i class="fas fa-filter me-1"></i> {% trans "Apply" %}
+                                <i class="fas fa-filter me-1"></i> {% trans "Apply Filters" %}
                             </button>
                             {% if job_filter or stage_filter or search_query %}
                                 <a href="{% url 'candidate_list' %}" class="btn btn-outline-secondary btn-sm">
@@ -255,6 +262,7 @@
     </div>
 </div>
 
+
     {% if candidates %}
         <div id="candidate-list">
             {# View Switcher - list_id must match the container ID #}