diff --git a/apps/templates/layouts/base.html b/apps/templates/layouts/base.html
index 782c36e..060ea51 100644
--- a/apps/templates/layouts/base.html
+++ b/apps/templates/layouts/base.html
@@ -29,14 +29,16 @@
 
         {% block stylesheets %}{% endblock stylesheets %}
     </head>
-    <body data-bs-theme="light" class="bg-body vh-100">
+    <body data-bs-theme="light" class="bg-body d-flex flex-column vh-100 overflow-hidden">
 
-        <div class="h-100 d-flex flex-column align-items-stretch flex-nowrap">
-            {% include 'includes/navbar.html' %}
-            {% block content %}{% endblock content %}
-            {% include 'includes/footer.html' %}
+        {% include 'includes/navbar.html' %}
+
+        <div class="flex-grow-1 overflow-y-auto" style="max-height: calc(100vh - 136px);">
+            {% block content %}{% endblock content %}            
         </div>
 
+        {% include 'includes/footer.html' %}
+
         {% include 'includes/toasts.html' %}
 
         <script>
