diff --git a/templates/common/base.html b/templates/common/base.html
index 01a2bbc..74d1675 100644
--- a/templates/common/base.html
+++ b/templates/common/base.html
@@ -23,12 +23,19 @@
         
         .navbar {
             background-color: var(--primary-color) !important;
+            position: sticky;
+            top: 0;
+            z-index: 1030;
         }
         
         .sidebar {
             background-color: white;
             min-height: calc(100vh - 56px);
             box-shadow: 2px 0 5px rgba(0, 0, 0, 0.1);
+            position: sticky;
+            top: 56px; /* Height of the navbar */
+            height: calc(100vh - 56px);
+            overflow-y: auto;
         }
         
         .sidebar .nav-link {