diff --git a/Server/Pages/_DataGrid.cshtml b/Server/Pages/_DataGrid.cshtml
index f9eb7d13..d8d94355 100644
--- a/Server/Pages/_DataGrid.cshtml
+++ b/Server/Pages/_DataGrid.cshtml
@@ -1,7 +1,7 @@
 @model IndexModel
 
-<div id="dataGridFrame" class="tab-pane fade active show in">
-    <div id="deviceGridWrapper">
+<div id="deviceGridFrame" class="tab-pane fade active show in h-100">
+    <div id="deviceGridInnerWrapper">
         <div id="gridControlsWrapper">
             <div>
                 <label>Device Group:</label>
diff --git a/Server/Pages/_IndexLoggedIn.cshtml b/Server/Pages/_IndexLoggedIn.cshtml
index 727bd57d..5e833a9c 100644
--- a/Server/Pages/_IndexLoggedIn.cshtml
+++ b/Server/Pages/_IndexLoggedIn.cshtml
@@ -3,7 +3,7 @@
 <div class="work-area hidden">
     <ul class="nav nav-tabs">
         <li class="nav-item">
-            <a class="nav-link active show" href="#dataGridFrame" data-toggle="tab">
+            <a class="nav-link active show" href="#deviceGridFrame" data-toggle="tab">
                 Grid
             </a>
         </li>
diff --git a/Server/wwwroot/css/site.css b/Server/wwwroot/css/site.css
index 837c5294..e65a828c 100644
--- a/Server/wwwroot/css/site.css
+++ b/Server/wwwroot/css/site.css
@@ -33,7 +33,7 @@ h6 {
     display: grid;
     grid-template-rows: min-content auto;
     grid-row-gap: 15px;
-    height: calc(100vh - 155px);
+    height: calc(100vh - 160px);
     overflow-y: hidden;
 }
 #consoleAlert {
@@ -54,8 +54,11 @@ h6 {
 }
 
 
-#dataGridFrame {
-    max-height: calc(100vh - 250px);
+
+#deviceGridInnerWrapper {
+    display: grid;
+    grid-auto-rows: auto 1fr;
+    height: 100%;
 }
 
 .record-row {