diff --git a/freedata_gui/src/components/chat.vue b/freedata_gui/src/components/chat.vue
index 6450484f..dcfcff43 100644
--- a/freedata_gui/src/components/chat.vue
+++ b/freedata_gui/src/components/chat.vue
@@ -157,7 +157,7 @@ watch(
           </nav>
 
           <!-- Chat Messages Area -->
-          <div class="flex-grow-1 overflow-auto" ref="messagesContainer">
+          <div class="overflow-auto" style="height: calc(100vh - 156px)" ref="messagesContainer">
             <chat_messages />
           </div>
 
diff --git a/freedata_gui/src/components/chat_messages.vue b/freedata_gui/src/components/chat_messages.vue
index 5e66dab1..5f060521 100644
--- a/freedata_gui/src/components/chat_messages.vue
+++ b/freedata_gui/src/components/chat_messages.vue
@@ -24,7 +24,7 @@ function getDateTime(timestampRaw) {
 </script>
 
 <template>
-  <div class="tab-content p-3 vh-100" id="nav-tabContent-chat-messages">
+  <div class="tab-content p-3" id="nav-tabContent-chat-messages">
     <template
       v-for="(details, callsign, key) in chat.callsign_list"
       :key="callsign"
diff --git a/freedata_gui/src/components/main.vue b/freedata_gui/src/components/main.vue
index 89d27c2d..66366af8 100644
--- a/freedata_gui/src/components/main.vue
+++ b/freedata_gui/src/components/main.vue
@@ -40,8 +40,8 @@ import { loadAllData } from "../js/eventHandler";
       </div>
 
       <!-- Main Content -->
-      <div class="col min-vh-100 m-0 p-0">
-        <div class="tab-content" id="nav-tabContent-settings">
+      <div class="col min-vh-50 m-0 p-0">
+        <div class="tab-content">
           <!-- Tab Panes -->
           <div
             class="tab-pane fade"
@@ -74,13 +74,11 @@ import { loadAllData } from "../js/eventHandler";
             <chat />
           </div>
           <settings_view />
-          <main_footer_navbar />
+        <!-- Footer Area -->
+         <main_footer_navbar />
         </div>
 
-        <!-- Footer Area -->
-        <div class="container">
-          <!--<main_footer_navbar />-->
-        </div>
+
       </div>
     </div>
   </div>