diff --git a/src/main/webapp/WEB-INF/jsp/include/bottom.jsp b/src/main/webapp/WEB-INF/jsp/include/bottom.jsp
index 4168f714..68bade91 100644
--- a/src/main/webapp/WEB-INF/jsp/include/bottom.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/bottom.jsp
@@ -1,7 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
 <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
 <!-- Footer -->
-<footer class="content-footer footer bg-footer-theme">
+<footer class="content-footer footer bg-footer-theme" style="height:1.5rem">
 	<div class="container-xxl d-flex flex-wrap justify-content-between py-0 flex-md-row flex-column">
 		<div class="mb-2 mb-md-0 w-100">
 			© <span id="footerYear"></span>, made with XIT Base by
diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp
index 48c712ad..3c0e9a34 100644
--- a/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -8,7 +8,7 @@
         	<div class="layout-page">
         		<div class="content-wrapper mt-2">
         			<jsp:include page="/WEB-INF/jsp/include/userMenus.jsp" />
-        			<div class="content-body menu-aware">
+        			<div class="content-body menu-aware" style="flex:1 1 auto">
 						<div class="sticky-wrapper">
 							<ul id="menu-tabs" class="nav nav-tabs sticky-element" role="tablist" 
 							style="--bs-nav-link-padding-y: .125rem; background-image: linear-gradient(#8AB9DB, whitesmoke);">
diff --git a/src/main/webapp/resources/css/xit-extend.css b/src/main/webapp/resources/css/xit-extend.css
index 7209614f..db9c1c74 100644
--- a/src/main/webapp/resources/css/xit-extend.css
+++ b/src/main/webapp/resources/css/xit-extend.css
@@ -57,7 +57,8 @@ select {
 }
 
 #main-tab-content > div {
-    height : 100%;
+    height : max(50rem, calc(100dvh - 56px - 0.5rem - 26.25px - 0.5rem - 1.5rem));
+    overflow-y : auto;
 }
 
 .wrapper-dashboard {