diff --git a/package.json b/package.json
index d2f99428..f3e2cd36 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.5.1-w",
+  "version": "0.5.1-x",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/public/styles/style.css b/public/styles/style.css
index 4468bd05..27f5d9ab 100644
--- a/public/styles/style.css
+++ b/public/styles/style.css
@@ -61,6 +61,14 @@ body {
     grid-template-areas: "header header" "nav nav" "content content" "footer footer";
 }
 
+.nofooter.fullscreen.menu_stack #container {
+    -ms-grid-rows: 66px minmax(24px, max-content) 1fr 0px;
+    grid-template-rows: 66px minmax(24px, max-content) auto 0px;
+    -ms-grid-columns: 90px 1fr;
+    /*grid-template-columns: 90px repeat(auto-fit, minmax(900px, 1fr));*/
+    grid-template-areas: "header header" "nav nav" "content content" "footer footer";
+}
+
 .fullscreen #container {
     width: 100%;
     min-width: 100%;
@@ -79,6 +87,11 @@ body {
     grid-template-rows: 66px 24px auto 45px;
 }
 
+.nofooter #container {
+    -ms-grid-rows: 66px 24px 1fr 0px;
+    grid-template-rows: 66px 24px auto 0px;
+}
+
 .fulldesk #container {
     width: 100%;
     height: 100%;
@@ -294,6 +307,7 @@ body {
     background-color: #fff;
     /* max-height: calc(100vh - 151px); */
     min-width: unset;
+    overflow: hidden;
 }
 
 .night #column_l {
@@ -314,7 +328,7 @@ body {
     width: unset;
     /* height: calc(100vh - 111px);
         width: calc(100% - 30px); */
-    overflow-y: auto;
+    overflow: hidden;
 }
 
 .menu_stack.fullscreen #column_l, .login #column_l, .arg_hide #column_l {
diff --git a/views/default.handlebars b/views/default.handlebars
index a9aaeea5..f26f925d 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -812,7 +812,7 @@
                     <div id="p17BackButton" style="float:left"><div class="backButton" tabindex=0 onclick=goBack() title="Back" onkeypress="if (event.key == 'Enter') goBack()"><div class="backButtonEx"></div></div></div>
                     <h1>Details - <span id=p17deviceName></span></h1>
                 </div>
-                <div id=p17info></div>
+                <div id=p17info style="overflow-y:auto"></div>
             </div>
             <div id=p19 style="display:none">
                 <div id="p19title">
@@ -1383,17 +1383,7 @@
             QV('p40title', !(hide & 8));
             QV('p41title', !(hide & 8));
             //if (hide & 16) { QV('page_leftbar', false); QS('page_content').left = '0px'; }
-
-            if (hide != 0) {
-                // Fix the main grid to zero-height elements we want to hide.
-                if (uiMode == 2) {
-                    QS('container')['grid-template-rows'] = ((hide & 1) ? '0' : '66') + 'px fit-content(48px) auto ' + ((hide & 4) ? '0' : '45') + 'px';
-                    QS('container')['-ms-grid-rows'] = ((hide & 1) ? '0' : '66') + 'px fit-content(48px) auto ' + ((hide & 4) ? '0' : '45') + 'px';
-                } else {
-                    QS('container')['grid-template-rows'] = ((hide & 1) ? '0' : '66') + 'px ' + ((hide & 2) ? '0' : '24') + 'px auto ' + ((hide & 4) ? '0' : '45') + 'px';
-                    QS('container')['-ms-grid-rows'] = ((hide & 1) ? '0' : '66') + 'px ' + ((hide & 2) ? '0' : '24') + 'px auto ' + ((hide & 4) ? '0' : '45') + 'px';
-                }
-            }
+            if (!footerBar) { QC('body').add('nofooter'); } else { QC('body').remove('nofooter'); }
 
             // Adjust height of remote desktop, files and Intel AMT
             // 1 = Top bar, 2 = Tool Bar, 4 = Bottom Bar, 8 = Tab Title
@@ -1435,6 +1425,8 @@
             }
             QS('p43iframe')['height'] = 'calc(100vh - ' + (84 + xh) + 'px)';
             QS('p43iframe')['max-height'] = 'calc(100vh - ' + (84 + xh) + 'px)';
+            QS('p17info')['height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
+            QS('p17info')['max-height'] = 'calc(100vh - ' + (20 + xh + xh2) + 'px)';
             QS('p16events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';
             QS('p16events')['max-height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';
             QS('p31events')['height'] = 'calc(100vh - ' + (50 + xh + xh2) + 'px)';