diff --git a/expenses_manager/expenses/static/expenses/css/base.css b/expenses_manager/expenses/static/expenses/css/base.css
index 5cb5517..0501db0 100644
--- a/expenses_manager/expenses/static/expenses/css/base.css
+++ b/expenses_manager/expenses/static/expenses/css/base.css
@@ -1,7 +1,7 @@
 body {
     margin: 0;
     font-family: system-ui, sans-serif;
-    background: #f6f7f9;
+    background: #f7f7f7;
 }
 
 .topbar {
@@ -36,8 +36,16 @@ body {
     text-decoration: underline;
 }
 
+.nav-item.active {
+    font-weight: bold;
+    border-bottom: 2px solid white;
+}
+
 .logout-form {
     margin: 0;
+    border: none;
+    cursor: pointer;
+    color: white;
 }
 
 .spacer {
diff --git a/expenses_manager/expenses/templates/expenses/base.html b/expenses_manager/expenses/templates/expenses/base.html
index ddb876c..054c3ee 100644
--- a/expenses_manager/expenses/templates/expenses/base.html
+++ b/expenses_manager/expenses/templates/expenses/base.html
@@ -6,18 +6,19 @@
         <title>{% block title %}Expenses manager{% endblock %}</title>
         <link rel="stylesheet" href="{% static 'expenses/css/base.css' %}">
         <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+        {% block extra_css %}{% endblock %}
     </head>
 
     <body>
         {% if user.is_authenticated %}
             <header class="topbar">
                 <nav class="nav">
-                    <a href="{% url 'home' %}">Home</a>
-                    <a href="{% url 'dashboard' %}">Dashboard</a>
-                    <a href="{% url 'expense_list' %}">Gastos</a>
-                    <a href="{% url 'account_list' %}">Cuentas</a>
-                    <a href="{% url 'income_list' %}">Ingresos</a>
-                    <a href="{% url 'tag_list' %}">Etiquetas</a>
+                    <a href="{% url 'home' %}" class="nav-item {% if active_menu == 'home' %}active{% endif %} ">Home</a>
+                    <a href="{% url 'dashboard' %}" class="nav-item {% if active_menu == 'dashboard' %}active{% endif %} ">Dashboard</a>
+                    <a href="{% url 'expense_list' %}" class="nav-item {% if active_menu == 'expenses' %}active{% endif %} ">Gastos</a>
+                    <a href="{% url 'account_list' %}" class="nav-item {% if active_menu == 'accounts' %}active{% endif %} ">Cuentas</a>
+                    <a href="{% url 'income_list' %}" class="nav-item {% if active_menu == 'incomes' %}active{% endif %} ">Ingresos</a>
+                    <a href="{% url 'tag_list' %}" class="nav-item {% if active_menu == 'tags' %}active{% endif %} ">Etiquetas</a>
 
                     <span class="spacer"></span>
 
@@ -37,5 +38,7 @@
         <main class="content">
             {% block content %}{% endblock %}
         </main>
+
+        {% block extra_js %}{% endblock %}
     </body>
 </html>
\ No newline at end of file
diff --git a/expenses_manager/expenses/templates/expenses/base_auth.html b/expenses_manager/expenses/templates/expenses/base_auth.html
new file mode 100644
index 0000000..04b7bca
--- /dev/null
+++ b/expenses_manager/expenses/templates/expenses/base_auth.html
@@ -0,0 +1,14 @@
+{% load static %}
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>{% block title %}Login{% endblock %}</title>
+        <link rel="stylesheet" href="{% static 'expenses/css/base.css' %}">
+    </head>
+    <body>
+        <main class="auth-container">
+            {% block content %}{% endblock %}
+        </main>
+    </body>
+</html>
\ No newline at end of file
diff --git a/expenses_manager/expenses/templates/registration/login.html b/expenses_manager/expenses/templates/registration/login.html
index 0bab9e8..0999b6f 100644
--- a/expenses_manager/expenses/templates/registration/login.html
+++ b/expenses_manager/expenses/templates/registration/login.html
@@ -1,6 +1,4 @@
-{% extends "expenses/base.html" %}
-
-{% block title %}Login{% endblock %}
+{% extends "expenses/base_auth.html" %}
 
 {% block content %}
 
diff --git a/expenses_manager/expenses/views.py b/expenses_manager/expenses/views.py
index 861bf7d..daa338e 100644
--- a/expenses_manager/expenses/views.py
+++ b/expenses_manager/expenses/views.py
@@ -90,6 +90,7 @@ def home(request):
         })
         
     return render(request, 'expenses/home.html', {
+        'active_menu': 'home',
         'last_expenses': last_expenses,
         'kpi_total': kpi_total,
         'kpi_count': kpi_count,
@@ -180,6 +181,7 @@ def expense_list(request):
         request,
         'expenses/expense_list.html',
         {
+            'active_menu': 'expenses',
             'expenses': page_obj,
             'page_obj': page_obj,            
             'selected_year': year,
@@ -216,7 +218,7 @@ def expense_create(request):
     return render(
         request,
         'expenses/expense_form.html',
-        {'form': form},
+        {'active_menu': 'expenses','form': form},
     )
 
 
@@ -238,7 +240,7 @@ def expense_edit(request, pk):
     return render(
         request,
         'expenses/expense_form.html',
-        {'form': form}
+        {'active_menu': 'expenses','form': form}
     )
 
 
@@ -257,7 +259,7 @@ def expense_delete(request, pk):
     return render(
         request,
         'expenses/expense_confirm_delete.html',
-        {'expense': expense},
+        {'active_menu': 'expenses','expense': expense},
     )
 
 
@@ -499,6 +501,7 @@ def dashboard(request):
     
     # Send the data to the dashboard
     return render(request, 'expenses/dashboard.html', {
+        'active_menu': 'dashboard',
         'by_category': by_category, 
         'by_month': by_month,
         'chart_labels': chart_labels,
@@ -532,7 +535,7 @@ def tag_list(request):
     return render(
         request,
         'expenses/tag_list.html',
-        {'tags':tags}
+        {'active_menu': 'tags','tags':tags}
     )
 
 
@@ -551,7 +554,7 @@ def tag_create(request):
     return render(
         request,
         'expenses/tag_form.html',
-        {'form': form}
+        {'active_menu': 'tags','form': form}
     )
 
 
@@ -574,7 +577,7 @@ def tag_edit(request, pk):
     return render(
         request,
         'expenses/tag_form.html',
-        {'form': form}
+        {'active_menu': 'tags','form': form}
     )
 
 
@@ -593,7 +596,7 @@ def tag_delete(request, pk):
     return render(
         request,
         'expenses/tag_confirm_delete.html',
-        {'tag': tag}
+        {'active_menu': 'tags','tag': tag}
     )
 
 
@@ -603,7 +606,7 @@ def account_list(request):
     return render(
         request,
         'expenses/account_list.html',
-        {'accounts': accounts}
+        {'active_menu': 'accounts','accounts': accounts}
     )
 
 
@@ -622,7 +625,7 @@ def account_create(request):
     return render(
         request,
         'expenses/account_form.html',
-        {'form': form}
+        {'active_menu': 'accounts','form': form}
     )
     
 @login_required
@@ -644,7 +647,7 @@ def account_edit(request, pk):
     return render(
         request,
         'expenses/account_form.html',
-        {'form': form}
+        {'active_menu': 'accounts','form': form}
     )
 
 @login_required
@@ -659,7 +662,7 @@ def account_delete(request, pk):
     return render(
         request,
         'expenses/account_confirm_delete.html',
-        {'account':account}
+        {'active_menu': 'accounts','account':account}
     )
 
 @login_required
@@ -677,7 +680,7 @@ def income_create(request):
     return render(
         request,
         'expenses/income_form.html',
-        {'form': form}
+        {'active_menu': 'incomes','form': form}
     )
 
 @login_required
@@ -687,7 +690,7 @@ def income_list(request):
     return render(
         request,
         'expenses/income_list.html',
-        {'incomes': incomes}
+        {'active_menu': 'incomes','incomes': incomes}
     )
 
 @login_required
@@ -709,7 +712,7 @@ def income_edit(request, pk):
     return render(
         request,
         'expenses/income_form.html',
-        {'form': form}
+        {'active_menu': 'incomes','form': form}
     )
 
 @login_required
@@ -723,6 +726,6 @@ def income_delete(request, pk):
     return render(
         request,
         'expenses/income_confirm_delete.html',
-        {'income':income}
+        {'active_menu': 'incomes','income':income}
     )
 
