diff --git a/xroom-dashboard/src/App.vue b/xroom-dashboard/src/App.vue
index 051a313..1b6d633 100644
--- a/xroom-dashboard/src/App.vue
+++ b/xroom-dashboard/src/App.vue
@@ -8,17 +8,15 @@
           <AppHeader @toggle-sidebar="toggleSidebar" :pageTitle="$route.meta.title" />
           <router-view></router-view>
         </div>
-        <Footer />
       </div>
     </template>
 
     <!-- Sample Layout for SignUp, etc. -->
     <template v-else>
       <router-view></router-view>
-      <Footer />
     </template>
 
-
+    <Footer />
   </div>
 </template>
 
@@ -50,6 +48,15 @@ export default {
       this.isSidebarOpen = !this.isSidebarOpen;
     }
   },
+  mounted() {
+    const content = document.querySelector('.content');
+    if (content) {
+      content.addEventListener('scroll', () => {
+        document.body.scrollTop = content.scrollTop;
+        document.documentElement.scrollTop = content.scrollTop;
+      });
+    }
+  }
 };
 </script>
 
@@ -115,20 +122,16 @@ router-view {
   flex-direction: column;
   gap: 32px;
   padding: 35px 80px;
-
-}
-
-.dashboard-page::-webkit-scrollbar {
-  width: 0;
-  display: none;
-}
-
-.dashboard-page {
   height: 100vh;
   overflow-y: scroll;
   box-sizing: border-box;
 }
 
+.content::-webkit-scrollbar {
+  width: 0;
+  display: none;
+}
+
 /* Responsive Styles */
 @media (max-width: 520px) {
   .dashboard-page {
@@ -184,9 +187,7 @@ router-view {
 
 @media (min-width: 1280px) and (max-width : 1440px){
   .dashboard-page {
-    position: fixed;
-    width: 80%;
-    right: 20%;
+    margin-right: 20rem;
     padding: 20px;
     direction: rtl;
   }
@@ -196,11 +197,9 @@ router-view {
   }
 }
 
-@media (min-width: 1440px) and (max-width : 1500px){
+@media (min-width: 1440px){
   .dashboard-page {
-    position: fixed;
-    width: 80%;
-    right: 20%;
+    margin-right: 20rem;
     padding: 20px;
     direction: rtl;
   }
@@ -209,15 +208,4 @@ router-view {
     padding: 35px 80px !important;
   }
 }
-
-@media (min-width: 1500px){
-  .dashboard-page {
-    position: fixed;
-    width: 80%;
-    right: 20%;
-    padding: 20px;
-    direction: rtl;
-  }
-}
-
 </style>
\ No newline at end of file