diff --git a/app/templates/monthly_overview/pages/overview.html b/app/templates/monthly_overview/pages/overview.html
index 0f8db3d..e54afa1 100644
--- a/app/templates/monthly_overview/pages/overview.html
+++ b/app/templates/monthly_overview/pages/overview.html
@@ -152,7 +152,7 @@
               <i class="fa-solid fa-filter fa-fw"></i>
             </button>
 
-            {# 2. Search box #}
+            {# Search box #}
             <label for="quick-search">
             </label>
             <input type="search"
@@ -170,7 +170,7 @@
                          show <.transaction/> in <#transactions-list/>
                          when its textContent.toLowerCase() contains my value.toLowerCase()">
 
-            {# 3. Order by icon dropdown #}
+            {# Order by icon dropdown #}
             <button class="btn btn-secondary dropdown-toggle dropdown-toggle-no-icon" type="button"
                     data-bs-toggle="dropdown" aria-expanded="false"
                     title="{% translate 'Order by' %}">
diff --git a/app/templates/transactions/fragments/list_all.html b/app/templates/transactions/fragments/list_all.html
index 0c9f7cd..24d1692 100644
--- a/app/templates/transactions/fragments/list_all.html
+++ b/app/templates/transactions/fragments/list_all.html
@@ -5,121 +5,128 @@
 
 <div id="transactions-list">
   {% for x in transactions_by_date %}
-    <div id="{{ x.grouper|slugify }}"
-         _="on htmx:afterSettle from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
-      <div class="mt-3 mb-1 w-100 tw:text-base border-bottom bg-body">
+    <div id="{{ x.grouper|slugify }}" class="transactions-divider"
+         _="on htmx:afterSwap from #transactions if sessionStorage.getItem(my id) is null then sessionStorage.setItem(my id, 'true')">
+      <div class="mt-3 mb-1 w-100 tw:text-base border-bottom bg-body transactions-divider-title">
         <a class="text-decoration-none d-inline-block w-100"
            role="button"
            data-bs-toggle="collapse"
            data-bs-target="#c-{{ x.grouper|slugify }}-collapse"
            id="c-{{ x.grouper|slugify }}-collapsible"
-           aria-expanded="true"
+           aria-expanded="false"
            aria-controls="c-{{ x.grouper|slugify }}-collapse">
         {{ x.grouper }}
         </a>
       </div>
-      <div class="collapse" id="c-{{ x.grouper|slugify }}-collapse"
+      <div class="collapse transactions-divider-collapse" id="c-{{ x.grouper|slugify }}-collapse"
            _="on shown.bs.collapse sessionStorage.setItem(the closest parent @id, 'true')
               on hidden.bs.collapse sessionStorage.setItem(the closest parent @id, 'false')
-              on htmx:afterSettle from #transactions
+              on htmx:afterSettle from #transactions or toggle
                 set state to sessionStorage.getItem(the closest parent @id)
                 if state is 'true' or state is null
                   add .show to me
                   set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to true
-                end">
+                else
+                  remove .show from me
+                  set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to false
+                end
+              on show
+                add .show to me
+                set @aria-expanded of #c-{{ x.grouper|slugify }}-collapsible to true">
         <div class="d-flex flex-column">
         {% for transaction in x.list %}
-          <c-transaction.item :transaction="transaction"></c-transaction.item>
+          <c-transaction.item
+            :transaction="transaction"></c-transaction.item>
         {% endfor %}
         </div>
       </div>
     </div>
   {% empty %}
     <c-msg.empty
-      title="{% translate "No transactions found" %}"
-      subtitle="{% translate "Try adding one" %}"></c-msg.empty>
-{% endfor %}
+        title="{% translate "No transactions found" %}"
+        subtitle="{% translate "Try adding one" %}"></c-msg.empty>
+  {% endfor %}
 
   {% if page_obj.has_other_pages %}
-  <div class="mt-auto">
-    <input value="{{ page_obj.number }}" name="page" type="hidden" id="page">
+    <div class="mt-auto">
+      <input value="{{ page_obj.number }}" name="page" type="hidden" id="page">
 
-    <nav aria-label="{% translate 'Page navigation' %}">
-    <ul class="pagination justify-content-center mt-5">
-      <li class="page-item">
-        <a class="page-link tw:cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
-           hx-get="{% if page_obj.has_previous %}{% url 'transactions_all_list' %}{% endif %}"
-           hx-vals='{"page": 1}'
-           hx-include="#filter, #order"
-           hx-target="#transactions-list"
-           aria-label="Primeira página"
-           hx-swap="show:top">
-          <span aria-hidden="true">&laquo;</span>
-        </a>
-      </li>
-      {% for page_number in page_obj.paginator.page_range %}
-              {% comment %}
+      <nav aria-label="{% translate 'Page navigation' %}">
+        <ul class="pagination justify-content-center mt-5">
+          <li class="page-item">
+            <a class="page-link tw:cursor-pointer {% if not page_obj.has_previous %}disabled{% endif %}"
+               hx-get="{% if page_obj.has_previous %}{% url 'transactions_all_list' %}{% endif %}"
+               hx-vals='{"page": 1}'
+               hx-include="#filter, #order"
+               hx-target="#transactions-list"
+               aria-label="Primeira página"
+               hx-swap="show:top">
+              <span aria-hidden="true">&laquo;</span>
+            </a>
+          </li>
+          {% for page_number in page_obj.paginator.page_range %}
+            {% comment %}
                   This conditional allows us to display up to 3 pages before and after the current page
                   If you decide to remove this conditional, all the pages will be displayed
 
                   You can change the 3 to any number you want e.g
                   To display only 5 pagination items, change the 3 to 2 (2 before and 2 after the current page)
               {% endcomment %}
-              {% if page_number <= page_obj.number|add:3 and page_number >= page_obj.number|add:-3 %}
-                  {% if page_obj.number == page_number %}
-                      <li class="page-item active">
-                          <a class="page-link tw:cursor-pointer">
-                              {{ page_number }}
-                          </a>
-                      </li>
-                  {% else %}
-                      <li class="page-item">
-                          <a class="page-link tw:cursor-pointer"
-                             hx-get="{% url 'transactions_all_list' %}"
-                             hx-vals='{"page": {{ page_number }}}'
-                             hx-include="#filter, #order"
-                             hx-target="#transactions-list"
-                             hx-swap="show:top">
-                              {{ page_number }}
-                          </a>
-                      </li>
-                  {% endif %}
+            {% if page_number <= page_obj.number|add:3 and page_number >= page_obj.number|add:-3 %}
+              {% if page_obj.number == page_number %}
+                <li class="page-item active">
+                  <a class="page-link tw:cursor-pointer">
+                    {{ page_number }}
+                  </a>
+                </li>
+              {% else %}
+                <li class="page-item">
+                  <a class="page-link tw:cursor-pointer"
+                     hx-get="{% url 'transactions_all_list' %}"
+                     hx-vals='{"page": {{ page_number }}}'
+                     hx-include="#filter, #order"
+                     hx-target="#transactions-list"
+                     hx-swap="show:top">
+                    {{ page_number }}
+                  </a>
+                </li>
               {% endif %}
-      {% endfor %}
-      {% if page_obj.number|add:3 < page_obj.paginator.num_pages %}
-        <li class="page-item">
-          <a class="page-link disabled"
-             aria-label="...">
-            <span aria-hidden="true">...</span>
-          </a>
-        </li>
-        <li class="page-item">
-          <a class="page-link tw:cursor-pointer"
-             hx-get="{% url 'transactions_all_list' %}" hx-target="#transactions-list"
-             hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
-             hx-include="#filter, #order"
-             hx-swap="show:top"
-             aria-label="Última página">
-            <span aria-hidden="true">{{ page_obj.paginator.num_pages }}</span>
-          </a>
-        </li>
-      {% endif %}
-      <li class="page-item">
-        <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw:cursor-pointer"
-           hx-get="{% if page_obj.has_next %}{% url 'transactions_all_list' %}{% endif %}"
-           hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
-           hx-include="#filter, #order"
-           hx-swap="show:top"
-           hx-target="#transactions-list"
-           aria-label="Next">
-          <span aria-hidden="true">&raquo;</span>
-        </a>
-      </li>
-    </ul>
-  </nav>
-  </div>
+            {% endif %}
+          {% endfor %}
+          {% if page_obj.number|add:3 < page_obj.paginator.num_pages %}
+            <li class="page-item">
+              <a class="page-link disabled"
+                 aria-label="...">
+                <span aria-hidden="true">...</span>
+              </a>
+            </li>
+            <li class="page-item">
+              <a class="page-link tw:cursor-pointer"
+                 hx-get="{% url 'transactions_all_list' %}" hx-target="#transactions-list"
+                 hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
+                 hx-include="#filter, #order"
+                 hx-swap="show:top"
+                 aria-label="Última página">
+                <span aria-hidden="true">{{ page_obj.paginator.num_pages }}</span>
+              </a>
+            </li>
+          {% endif %}
+          <li class="page-item">
+            <a class="page-link {% if not page_obj.has_next %}disabled{% endif %} tw:cursor-pointer"
+               hx-get="{% if page_obj.has_next %}{% url 'transactions_all_list' %}{% endif %}"
+               hx-vals='{"page": {{ page_obj.paginator.num_pages }}}'
+               hx-include="#filter, #order"
+               hx-swap="show:top"
+               hx-target="#transactions-list"
+               aria-label="Next">
+              <span aria-hidden="true">&raquo;</span>
+            </a>
+          </li>
+        </ul>
+      </nav>
+    </div>
   {% endif %}
-{#  Floating bar#}
+  {#  Floating bar#}
   <c-ui.transactions-action-bar></c-ui.transactions-action-bar>
 
 </div>
diff --git a/app/templates/transactions/pages/transactions.html b/app/templates/transactions/pages/transactions.html
index 0ce989f..9ff6860 100644
--- a/app/templates/transactions/pages/transactions.html
+++ b/app/templates/transactions/pages/transactions.html
@@ -8,45 +8,101 @@
   <div class="container px-md-3 py-3 column-gap-5">
     <div class="row gx-xl-4 gy-3">
       <div class="col-12 col-xl-8 order-2 order-xl-1">
-        <div class="row mb-1">
-          <div class="col-sm-6 col-12">
-            {#        Filter transactions button #}
-            <button type="button" class="btn btn-sm btn-outline-primary dropdown-toggle" type="button"
-                    data-bs-toggle="collapse" data-bs-target="#collapse-filter" aria-expanded="false"
-                    aria-controls="collapse-filter">
-              <i class="fa-solid fa-filter fa-fw me-2"></i>{% translate 'Filter transactions' %}
+        <div class="mb-3">
+          {# Hidden select to hold the order value and preserve the original update trigger #}
+          <select name="order" id="order" class="d-none" _="on change trigger updated on window">
+            <option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
+            <option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
+            <option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
+          </select>
+
+          {# Main control bar with filter, search, and ordering #}
+          <div class="input-group">
+
+            <button class="btn btn-secondary position-relative" type="button"
+                    data-bs-toggle="collapse" data-bs-target="#collapse-filter"
+                    aria-expanded="false" aria-controls="collapse-filter" id="filter-button" hx-preserve
+                    title="{% translate 'Filter transactions' %}">
+              <i class="fa-solid fa-filter fa-fw"></i>
             </button>
+
+            {# Search box #}
+            <label for="quick-search">
+            </label>
+            <input type="search"
+                   class="form-control"
+                   placeholder="{% translate 'Search' %}"
+                   hx-preserve
+                   id="quick-search"
+                   _="on input or search or htmx:afterSwap from window
+                         if my value is empty
+                           trigger toggle on <.transactions-divider-collapse/>
+                         else
+                           trigger show on <.transactions-divider-collapse/>
+                         end
+                         show <.transactions-divider-title/> when my value is empty
+                         show <.transaction/> in <#transactions-list/>
+                         when its textContent.toLowerCase() contains my value.toLowerCase()">
+
+            {# Order by icon dropdown #}
+            <button class="btn btn-secondary dropdown-toggle dropdown-toggle-no-icon" type="button"
+                    data-bs-toggle="dropdown" aria-expanded="false"
+                    title="{% translate 'Order by' %}">
+              <i class="fa-solid fa-sort fa-fw"></i>
+            </button>
+            <ul class="dropdown-menu dropdown-menu-end">
+              <li>
+                <button class="dropdown-item {% if order == 'default' %}active{% endif %}" type="button"
+                        _="on click remove .active from .dropdown-item in the closest <ul/>
+                           then add .active to me
+                           then set the value of #order to 'default'
+                           then trigger change on #order">
+                  {% translate 'Default' %}
+                </button>
+              </li>
+              <li>
+                <button class="dropdown-item {% if order == 'older' %}active{% endif %}" type="button"
+                        _="on click remove .active from .dropdown-item in the closest <ul/>
+                           then add .active to me
+                           then set the value of #order to 'older'
+                           then trigger change on #order">
+                  {% translate 'Oldest first' %}
+                </button>
+              </li>
+              <li>
+                <button class="dropdown-item {% if order == 'newer' %}active{% endif %}" type="button"
+                        _="on click remove .active from .dropdown-item in the closest <ul/>
+                           then add .active to me
+                           then set the value of #order to 'newer'
+                           then trigger change on #order">
+                  {% translate 'Newest first' %}
+                </button>
+              </li>
+            </ul>
           </div>
-          {#        Ordering button#}
-          <div class="col-sm-6 col-12 tw:content-center my-3 my-sm-0">
-            <div class="text-sm-end" _="on change trigger updated on window">
-              <label for="order">{% translate "Order by" %}</label>
-              <select
-                  class="tw:border-0 tw:focus-visible:outline-0 w-full pe-2 tw:leading-normal text-bg-tertiary tw:font-medium rounded bg-body text-body"
-                  name="order" id="order">
-                <option value="default"
-                        {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
-                <option value="older"
-                        {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
-                <option value="newer"
-                        {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
-              </select>
+
+          {# Filter transactions form #}
+          <div class="collapse" id="collapse-filter" hx-preserve>
+            <div class="card card-body">
+              <div class="text-end">
+                <button class="btn btn-outline-danger btn-sm tw:w-fit"
+                        _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
+              </div>
+
+              <form _="on change or submit or search trigger updated on window
+                         install init_tom_select
+                         install init_datepicker"
+                    id="filter" class="mt-3">
+                {% crispy filter.form %}
+              </form>
+
+              <div class="text-end">
+                <button class="btn btn-outline-danger btn-sm tw:w-fit"
+                        _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
+              </div>
             </div>
           </div>
         </div>
-        {#      Filter transactions form#}
-        <div class="collapse" id="collapse-filter">
-          <div class="card card-body">
-            <form _="on change or submit or search trigger updated on window end
-                   install init_tom_select
-                   install init_datepicker"
-                  id="filter">
-              {% crispy filter.form %}
-            </form>
-            <button class="btn btn-outline-danger btn-sm"
-                    _="on click call #filter.reset() then trigger change on #filter">{% translate 'Clear' %}</button>
-          </div>
-        </div>
         <div id="transactions"
              class="show-loading"
              hx-get="{% url 'transactions_all_list' %}"