diff --git a/static/css/components/layout.css b/static/css/components/layout.css
index 925fad6..4f585fa 100644
--- a/static/css/components/layout.css
+++ b/static/css/components/layout.css
@@ -5,6 +5,8 @@ body {
     font-family: Arial, sans-serif;
     background-color: var(--dark-bg);
     color: var(--text-color);
+    height: 100vh;
+    overflow: hidden;
 }
 
 body.with-sidebar {
@@ -14,11 +16,20 @@ body.with-sidebar {
 .main-content-area {
     flex: 1;
     min-width: 0; /* Prevents flex item from overflowing */
+    display: flex;
+    flex-direction: column;
 }
 
 #main-content {
     flex: 1;
     padding: 1rem;
+    overflow-y: auto;
+    scrollbar-width: none; /* Firefox */
+    -ms-overflow-style: none; /* IE and Edge */
+}
+
+#main-content::-webkit-scrollbar {
+    display: none; /* Chrome, Safari and Opera */
 }
 
 #main-content h1 {
diff --git a/static/css/components/sidebar.css b/static/css/components/sidebar.css
index 8b9456c..4aacf31 100644
--- a/static/css/components/sidebar.css
+++ b/static/css/components/sidebar.css
@@ -2,10 +2,10 @@
 .sidebar {
     width: 250px;
     background-color: var(--sidebar-bg);
-    min-height: 100vh;
+    height: 100vh;
     padding: 20px;
     box-shadow: 2px 0 5px rgba(0,0,0,0.3);
-    top: 3rem;
+    overflow-y: auto;
 }
 
 .sidebar h2 {