diff --git a/expenses_manager/expenses/templates/categories/form.html b/expenses_manager/expenses/templates/categories/form.html
index 61a27b6..581fff7 100644
--- a/expenses_manager/expenses/templates/categories/form.html
+++ b/expenses_manager/expenses/templates/categories/form.html
@@ -7,9 +7,9 @@
 {% block content %}
     <h2>Editar categoría</h2>
 
-    <form method="post">
+    <form method="post" class="app-form">
         {% csrf_token %}
-        {{ form.as_p }}
+        {% include "expenses/_form_fields.html" %}
         <div class="form-actions">
             <button type="submit" class="btn btn-primary">Guardar</button>
             <a class="btn btn-secondary" href="{% url 'category_list' %}">Cancelar</a>
diff --git a/expenses_manager/expenses/templates/categories/list.html b/expenses_manager/expenses/templates/categories/list.html
index e587118..81d918a 100644
--- a/expenses_manager/expenses/templates/categories/list.html
+++ b/expenses_manager/expenses/templates/categories/list.html
@@ -8,26 +8,27 @@
 
     <h1>Mis categorías</h1>
 
-    <h3> Nueva categoría</h3>
-    <form method="post">
+    <h3>Nueva categoría</h3>
+    <form method="post" class="app-form">
         {% csrf_token %}
-        {{ form.as_p }}
-        <button type="submit" class="btn btn-primary">Crear</button>   
+        {% include "expenses/_form_fields.html" %}
+        <button type="submit" class="btn btn-primary">Crear</button>
     </form>
 
     <hr>
 
     <h3>Listado</h3>
     <div class="table-wrap">
-    <table>
-        <thead>
-            <tr>
-                <th>Categoría</th>
-                <th>Categoría padre</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for category in categories %}
+        <table>
+            <thead>
+                <tr>
+                    <th>Categoría</th>
+                    <th>Categoría padre</th>
+                    <th></th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for category in categories %}
                 <tr>
                     <td>{{ category.name }}</td>
                     <td>{% if category.parent %}{{ category.parent.name }}{% endif %}</td>
@@ -36,9 +37,9 @@
                         <a href="{% url 'category_delete' category.id %}" class="danger">Eliminar</a>
                     </td>
                 </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+                {% endfor %}
+            </tbody>
+        </table>
     </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/expenses_manager/expenses/templates/expenses/account_form.html b/expenses_manager/expenses/templates/expenses/account_form.html
index e017818..92fb5f3 100644
--- a/expenses_manager/expenses/templates/expenses/account_form.html
+++ b/expenses_manager/expenses/templates/expenses/account_form.html
@@ -10,9 +10,9 @@
         {% endif %}
     </h1>
 
-    <form method="post">
+    <form method="post" class="app-form">
         {% csrf_token %}
-        {{ form.as_p }}
+        {% include "expenses/_form_fields.html" %}
 
         <div class="form-actions">
             <button type="submit" class="btn btn-primary">Guardar</button>
diff --git a/expenses_manager/expenses/templates/expenses/expense_form.html b/expenses_manager/expenses/templates/expenses/expense_form.html
index a925943..f900d70 100644
--- a/expenses_manager/expenses/templates/expenses/expense_form.html
+++ b/expenses_manager/expenses/templates/expenses/expense_form.html
@@ -7,7 +7,7 @@
         Nuevo gasto
     {% endif %}
 {% endblock %}
-    
+
 {% block content %}
     <h1>
         {% if form.instance.pk %}
@@ -17,34 +17,10 @@
         {% endif %}
     </h1>
 
-    <form method="post">
+    <form method="post" class="app-form">
         {% csrf_token %}
-        
-        {% for field in form %}
-            {% if field.name == "tags" %}
-                <div class="form-field">
-                    {{ field.label_tag }}
-                    <div class="tag-chip-list">
-                        {% for checkbox in field %}
-                            <label class="tag-chip">
-                                {{ checkbox.tag }}
-                                <span>{{ checkbox.choice_label }}</span>
-                            </label>
-                        {% endfor %}
-                    </div>
-                    {% if field.errors %}
-                        <div class="form-errors">{{ field.errors }}</div>
-                    {% endif %}
-                </div>
-            {% else %}
-                <p>
-                    {{ field.label_tag }} {{ field }}
-                    {% if field.errors %}
-                        <span class="form-errors">{{ field.errors }}</span>
-                    {% endif %}
-                </p>
-            {% endif %}
-        {% endfor %}
+
+        {% include "expenses/_form_fields.html" %}
 
         <div class="form-actions">
             <button type="submit" class="btn btn-primary">
diff --git a/expenses_manager/expenses/templates/expenses/income_form.html b/expenses_manager/expenses/templates/expenses/income_form.html
index 88495fa..9992000 100644
--- a/expenses_manager/expenses/templates/expenses/income_form.html
+++ b/expenses_manager/expenses/templates/expenses/income_form.html
@@ -16,9 +16,9 @@
         {% endif %}
     </h1>
 
-    <form method="post">
+    <form method="post" class="app-form">
         {% csrf_token %}
-        {{ form.as_p }}
+        {% include "expenses/_form_fields.html" %}
         <div class="form-actions">
             <button type="submit" class="btn btn-primary">
                 {% if form.instance.pk %}
diff --git a/expenses_manager/expenses/templates/expenses/tag_form.html b/expenses_manager/expenses/templates/expenses/tag_form.html
index 212c0a1..4ca6c31 100644
--- a/expenses_manager/expenses/templates/expenses/tag_form.html
+++ b/expenses_manager/expenses/templates/expenses/tag_form.html
@@ -3,9 +3,9 @@
 {% block content %}
     <h1>Etiqueta</h1>
 
-    <form method="post">
+    <form method="post" class="app-form">
         {% csrf_token %}
-        {{ form.as_p }}
+        {% include "expenses/_form_fields.html" %}
         <div class="form-actions">
             <button type="submit" class="btn btn-primary">Guardar</button>
             <a class="btn btn-secondary" href="{% url 'tag_list' %}">Volver</a>
diff --git a/expenses_manager/expenses/templates/fuel/create.html b/expenses_manager/expenses/templates/fuel/create.html
index 58a36cf..77cdb60 100644
--- a/expenses_manager/expenses/templates/fuel/create.html
+++ b/expenses_manager/expenses/templates/fuel/create.html
@@ -17,10 +17,10 @@
         {% endif %}
     </h1>
 
-    <form method="post">
+    <form method="post" class="app-form">
         {% csrf_token %}
         {% if next %}<input type="hidden" name="next" value="{{ next }}">{% endif %}
-        {{ form.as_p }}
+        {% include "expenses/_form_fields.html" %}
         <div class="form-actions">
             <button type="submit" class="btn btn-primary">
                 {% if editing %}
diff --git a/expenses_manager/expenses/templates/goals/form.html b/expenses_manager/expenses/templates/goals/form.html
index 550752a..2c2b2e4 100644
--- a/expenses_manager/expenses/templates/goals/form.html
+++ b/expenses_manager/expenses/templates/goals/form.html
@@ -1,16 +1,16 @@
 {% extends "expenses/base.html" %}
 {% block title %}
-    Nuevo objetivo
+    {{ title }}
 {% endblock %}
-    
+
 {% block content %}
     <h1>
-        Nuevo objetivo
+        {{ title }}
     </h1>
 
-    <form method="post">
+    <form method="post" class="app-form">
         {% csrf_token %}
-        {{ form.as_p }}
+        {% include "expenses/_form_fields.html" %}
         <div class="form-actions">
             <button type="submit" class="btn btn-primary">
                 Guardar
diff --git a/expenses_manager/expenses/templates/registration/login.html b/expenses_manager/expenses/templates/registration/login.html
index bcb98db..e9df499 100644
--- a/expenses_manager/expenses/templates/registration/login.html
+++ b/expenses_manager/expenses/templates/registration/login.html
@@ -4,9 +4,9 @@
 
 <h2>Iniciar sesión</h2>
 
-<form method="post">
+<form method="post" class="app-form">
     {% csrf_token %}
-    {{ form.as_p }}
+    {% include "expenses/_form_fields.html" %}
     <button type="submit" class="btn btn-primary">Entrar</button>
 </form>