diff --git a/admin/templates/admin_users.html b/admin/templates/admin_users.html
index 37fbf96..92bcf7a 100644
--- a/admin/templates/admin_users.html
+++ b/admin/templates/admin_users.html
@@ -1,15 +1,18 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+{% block actions %}
+
+    <a href="{% url 'admin:new_user' %}" class="btn btn-green-admin">
+      <i class="bi bi-person-add"></i>
+      {% translate "New user" %}
+    </a>
+{% endblock %}
+
+
 {% block content %}
-<div class="row">
-  <div class="col">
-    <h3>{{ subtitle }}</h3>
-  </div>
-  <div class="col-2">
-    <a href="{% url 'admin:new_user' %}" class="btn btn-green-admin">{% translate "Add new user" %}</a>
-  </div>
-</div>
+  <h3>{{ subtitle }}</h3>
+
 
 <div class="row">
   <div class="col">
diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html
index ff07943..94ec750 100644
--- a/dashboard/templates/base.html
+++ b/dashboard/templates/base.html
@@ -200,6 +200,11 @@
             </div>
           </div>
 
+          <div class="d-flex flex-wrap gap-2 justify-content-end">
+          {% block actions %}
+          {% endblock %}
+          </div>
+
           {% block content %}
           {% endblock content %}
 
diff --git a/dashboard/templates/unassigned_devices.html b/dashboard/templates/unassigned_devices.html
index 6f67a7a..303bb82 100644
--- a/dashboard/templates/unassigned_devices.html
+++ b/dashboard/templates/unassigned_devices.html
@@ -2,20 +2,13 @@
 {% load i18n %}
 {% load paginacion %}
 
-
-{% block content %}
-<div class="row">
-  <div class="col">
-    <h3>{{ subtitle }}</h3>
-  </div>
-  <div class="col text-center">
+{% block actions %}
     {% if lot %}
     <a href="{% url 'lot:documents' object.id %}" type="button" class="btn btn-green-admin">
       <i class="bi bi-folder2"></i>
       {% trans 'Documents' %}
     </a>
     {% endif %}
-
     <a href="{# url 'dashboard:exports' object.id #}" type="button" class="btn btn-todo" data-bs-toggle="tooltip" title="NOT IMPLEMENTED. This action tries to emulate what devicehub-teal did, which was related to opening a dialog where you can select different options for export the devices as csv for all selected devices" >
       <i class="bi bi-reply"></i>
       {% trans 'Exports' %}
@@ -26,8 +19,11 @@
       {% trans 'Annotations' %}
     </a>
     {% endif %}
-  </div>
-</div>
+
+{% endblock%}
+
+{% block content %}
+<h3>{{ subtitle }}</h3>
 
 <div class="dataTable-container">
   <form method="post">
diff --git a/lot/templates/lots.html b/lot/templates/lots.html
index 2aa866d..23c3d83 100644
--- a/lot/templates/lots.html
+++ b/lot/templates/lots.html
@@ -1,28 +1,29 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block content %}
-<div class="row mb-3">
-  <div class="col">
-    <h3>{{ subtitle }}</h3>
-  </div>
-  <div class="col text-center">
+{% block actions %}
     {% if show_closed %}
       <a href="?show_closed=false" class="btn btn-green-admin">
         {% trans 'Hide closed lots' %}
+
+      <i class="ps-2 bi bi-x-octagon-fill"></i>
       </a>
     {% else %}
       <a href="?show_closed=true" class="btn btn-green-admin">
         {% trans 'Show closed lots' %}
+
+      <i class="ps-2 bi bi-x-octagon"></i>
       </a>
     {% endif %}
 
     <a href="{% url 'lot:add' %}" type="button" class="btn btn-green-admin">
-      <i class="bi bi-plus"></i>
-      {% trans 'Add new lot' %}
+      <i class="bi bi-folder-plus"></i>
+      {% trans 'New lot' %}
     </a>
-  </div>
-</div>
+{% endblock %}
+
+{% block content %}
+
 
 <div class="row">
   <table class= "table table-striped table-sm">