diff --git a/templates/base.html b/templates/base.html
index c4eed0a..1bd0516 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -29,6 +29,7 @@
             background-color: #f8f9fa;
             margin: 0;
             padding: 0;
+            min-height: 100vh;
         }
 
         .navbar {
@@ -100,18 +101,19 @@
         }
 
         .nav-link {
-            color: var(--secondary-color) !important;
+            color: #fff !important;
             transition: color 0.3s ease;
             padding: 0.5rem 1rem;
             white-space: nowrap;
         }
 
         .nav-link:hover {
-            color: var(--primary-color) !important;
+            color: rgba(255, 255, 255, 0.8) !important;
         }
 
         .nav-link.active {
-            color: var(--primary-color) !important;
+            color: rgba(255, 255, 255, 0.9) !important;
+            font-weight: 500;
         }
 
         .dropdown-menu {
@@ -135,33 +137,43 @@
         }
 
         .container {
-            max-width: 1320px;
-            margin: 0 auto;
-            padding: 0 1rem;
+            max-width: 1320px !important;
+            margin: 0 auto !important;
+        }
+
+        @media (max-width: 1400px) {
+            .container {
+                max-width: 1140px !important;
+            }
         }
 
         @media (max-width: 1200px) {
             .container {
-                max-width: 960px;
+                max-width: 960px !important;
+            }
+            .page-wrapper {
+                padding: 1.5rem 0.75rem;
             }
         }
 
         @media (max-width: 992px) {
             .container {
-                max-width: 720px;
+                max-width: 720px !important;
             }
         }
 
         @media (max-width: 768px) {
             .container {
-                max-width: 540px;
+                max-width: 540px !important;
+            }
+            .page-wrapper {
+                padding: 1rem 0.5rem;
             }
         }
 
         @media (max-width: 576px) {
-            .container {
-                width: 100%;
-                padding: 0.5rem;
+            .page-wrapper {
+                padding: 0.75rem 0.25rem;
             }
         }
 
@@ -403,6 +415,11 @@
                 font-size: 1.5rem;
             }
         }
+
+        .page-wrapper {
+            padding: 2rem 1rem;
+            min-height: calc(100vh - 70px);
+        }
     </style>
     {% block extra_css %}{% endblock %}
 </head>
@@ -458,6 +475,7 @@
         </div>
     </nav>
 
+<<<<<<< HEAD
     <!-- Conteúdo -->
     <div class="container mt-4">
         {% with messages = get_flashed_messages(with_categories=true) %}
@@ -470,6 +488,23 @@
                 {% endfor %}
             {% endif %}
         {% endwith %}
+=======
+    <div class="page-wrapper">
+        <div class="container py-4">
+            {% with messages = get_flashed_messages(with_categories=true) %}
+                {% if messages %}
+                    {% for category, message in messages %}
+                        <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
+                            {{ message }}
+                            <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+                        </div>
+                    {% endfor %}
+                {% endif %}
+            {% endwith %}
+            {% block content %}{% endblock %}
+        </div>
+    </div>
+>>>>>>> 2499ae1 (style: melhora layout e espaçamento das interfaces - Ajusta margens e padding do container principal - Adiciona page-wrapper com espaçamento consistente - Corrige cores do menu para melhor legibilidade - Implementa responsividade para diferentes tamanhos de tela - Mantém estrutura consistente em todas as páginas)
 
         {% block content %}{% endblock %}
     </div>