diff --git a/Server/Pages/_ConsoleFrame.cshtml b/Server/Pages/_ConsoleFrame.cshtml
new file mode 100644
index 00000000..e6343fc6
--- /dev/null
+++ b/Server/Pages/_ConsoleFrame.cshtml
@@ -0,0 +1,66 @@
+@model IndexModel
+
+<div id="consoleFrame" class="console tab-pane fade">
+    <div>
+        <div id="consoleOutputDiv">
+            <div class="console-block">
+                <div class="console-prompt">@Model.DefaultPrompt</div>
+                <div class="console-output">Authentication successful.</div>
+            </div>
+        </div>
+
+        <div class="console-block">
+            <div class="console-input-prompt">@Model.DefaultPrompt</div>
+            <div>
+                <textarea id="consoleTextArea" spellcheck="false" maxlength="100000"></textarea>
+            </div>
+        </div>
+        <div id="commandCompletionWrapper">
+            <div id="commandCompletionDiv" class="hidden">
+
+            </div>
+            <div id="commandInfoDiv" class="hidden">
+
+            </div>
+        </div>
+    </div>
+    <div id="consoleStatusDiv" class="row m-0">
+        <div class="col-sm-6">
+            <span>
+                Command Mode:
+            </span>
+            <select id="commandModeSelect" class="console-status-value" title="Command Modes: Remotely interface, Windows PowerShell, PowerShell Core, Windows CMD Command Line, Linux BASH">
+                <option value="Web">Web</option>
+                <option value="PSCore">PSCore</option>
+                <option value="WinPS">WinPS</option>
+                <option value="CMD">CMD</option>
+                <option value="Bash">Bash</option>
+            </select>
+        </div>
+        <div class="col-sm-6">
+            <span>
+                Devices Selected:
+            </span>
+            <span id="devicesSelectedSpan" class="console-status-value">
+                0
+            </span>
+        </div>
+        <div class="clearfix"></div>
+        <div class="col-sm-6">
+            <span>
+                Online Devices:
+            </span>
+            <span id="onlineDevicesSpan" class="console-status-value">
+                0
+            </span>
+        </div>
+        <div class="col-sm-6">
+            <span>
+                Total Devices:
+            </span>
+            <span id="totalDevicesSpan" class="console-status-value">
+                0
+            </span>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/Server/Pages/_DataGrid.cshtml b/Server/Pages/_DataGrid.cshtml
index 0dcf347f..f0a1dcd0 100644
--- a/Server/Pages/_DataGrid.cshtml
+++ b/Server/Pages/_DataGrid.cshtml
@@ -1,6 +1,6 @@
 @model IndexModel
 
-<div id="dataGridFrame" class="tab-pane fade">
+<div id="dataGridFrame" class="tab-pane fade active show in">
     <div id="deviceGridWrapper">
         <div id="gridControlsWrapper">
             <div>
diff --git a/Server/Pages/_IndexLoggedIn.cshtml b/Server/Pages/_IndexLoggedIn.cshtml
index 67d2ac67..727bd57d 100644
--- a/Server/Pages/_IndexLoggedIn.cshtml
+++ b/Server/Pages/_IndexLoggedIn.cshtml
@@ -3,86 +3,25 @@
 <div class="work-area hidden">
     <ul class="nav nav-tabs">
         <li class="nav-item">
-            <a id="consoleTab" class="nav-link active show" href="#consoleFrame" data-toggle="tab">
+            <a class="nav-link active show" href="#dataGridFrame" data-toggle="tab">
+                Grid
+            </a>
+        </li>
+
+        <li class="nav-item">
+            <a id="consoleTab" class="nav-link" href="#consoleFrame" data-toggle="tab">
                 Console
                 <span id="consoleAlert" class="badge badge-info badge-pill align-top" hidden>
                     <i class="fa fa-exclamation" aria-hidden="true"></i>
                 </span>
-             </a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" href="#dataGridFrame" data-toggle="tab">
-                Grid
             </a>
         </li>
+
     </ul>
     <div id="tabContentWrapper">
-        <div class="tab-content h-100" style="overflow:auto">
-            <div id="consoleFrame" class="console tab-pane fade active show in">
-                <div>
-                    <div id="consoleOutputDiv">
-                        <div class="console-block">
-                            <div class="console-prompt">@Model.DefaultPrompt</div>
-                            <div class="console-output">Authentication successful.</div>
-                        </div>
-                    </div>
-
-                    <div class="console-block">
-                        <div class="console-input-prompt">@Model.DefaultPrompt</div>
-                        <div>
-                            <textarea id="consoleTextArea" spellcheck="false" maxlength="100000"></textarea>
-                        </div>
-                    </div>
-                    <div id="commandCompletionWrapper">
-                        <div id="commandCompletionDiv" class="hidden">
-
-                        </div>
-                        <div id="commandInfoDiv" class="hidden">
-
-                        </div>
-                    </div>
-                </div>
-                <div id="consoleStatusDiv" class="row m-0">
-                    <div class="col-sm-6">
-                        <span>
-                            Command Mode:
-                        </span>
-                        <select id="commandModeSelect" class="console-status-value" title="Command Modes: Remotely interface, Windows PowerShell, PowerShell Core, Windows CMD Command Line, Linux BASH">
-                            <option value="Web">Web</option>
-                            <option value="PSCore">PSCore</option>
-                            <option value="WinPS">WinPS</option>
-                            <option value="CMD">CMD</option>
-                            <option value="Bash">Bash</option>
-                        </select>
-                    </div>
-                    <div class="col-sm-6">
-                        <span>
-                            Devices Selected:
-                        </span>
-                        <span id="devicesSelectedSpan" class="console-status-value">
-                            0
-                        </span>
-                    </div>
-                    <div class="clearfix"></div>
-                    <div class="col-sm-6">
-                        <span>
-                            Online Devices:
-                        </span>
-                        <span id="onlineDevicesSpan" class="console-status-value">
-                            0
-                        </span>
-                    </div>
-                    <div class="col-sm-6">
-                        <span>
-                            Total Devices:
-                        </span>
-                        <span id="totalDevicesSpan" class="console-status-value">
-                            0
-                        </span>
-                    </div>
-                </div>
-            </div>
-            <partial name="_DataGrid"  model="Model" />
+        <div class="tab-content h-100">
+            <partial name="_DataGrid" model="Model" />
+            <partial name="_ConsoleFrame" model="Model" />
         </div>
     </div>
 
diff --git a/Server/wwwroot/css/site.css b/Server/wwwroot/css/site.css
index c440e02b..837c5294 100644
--- a/Server/wwwroot/css/site.css
+++ b/Server/wwwroot/css/site.css
@@ -66,6 +66,9 @@ h6 {
     padding: .5rem;
 }
 
+#tabContentWrapper {
+    overflow: auto;
+}
 
 #gridControlsWrapper {
     display: grid;
diff --git a/Server/wwwroot/scripts/DataGrid.ts b/Server/wwwroot/scripts/DataGrid.ts
index 29c7bd75..d1b94e82 100644
--- a/Server/wwwroot/scripts/DataGrid.ts
+++ b/Server/wwwroot/scripts/DataGrid.ts
@@ -6,7 +6,7 @@ import * as BrowserSockets from "./BrowserSockets.js";
 import { CreateGUID } from "./Utilities.js";
 
 
-export var DataSource: Array<Device> = new Array<Device>();
+export const DataSource: Array<Device> = new Array<Device>();
 
 export function AddOrUpdateDevices(devices: Array<Device>) {
     devices.forEach(x => {
@@ -103,6 +103,11 @@ export function RefreshGrid() {
     xhr.send();
 }
 export function ToggleSelectAll() {
+    var hiddenRows = DeviceGrid.querySelectorAll(".row-selected.hidden.row-selected");
+    hiddenRows.forEach(x => {
+        x.classList.remove("row-selected");
+    });
+
     var currentlySelected = DeviceGrid.querySelectorAll(".row-selected:not(.hidden)");
     if (currentlySelected.length > 0) {
         currentlySelected.forEach(elem => {
diff --git a/Server/wwwroot/scripts/UI.ts b/Server/wwwroot/scripts/UI.ts
index 451bba28..067b4a3e 100644
--- a/Server/wwwroot/scripts/UI.ts
+++ b/Server/wwwroot/scripts/UI.ts
@@ -1,17 +1,5 @@
-import * as CommandProcessor from "./CommandProcessor.js";
-import { UserSettings} from "./UserSettings.js";
+import { UserSettings} from "./UserSettings.js";
 import * as Utilities from "./Utilities.js";
-import { Store } from "./Store.js";
-import { ConsoleCommand } from "./Models/ConsoleCommand.js";
-import { CommandLineParameter } from "./Models/CommandLineParameter.js";
-import { WebCommands } from "./Commands/WebCommands.js";
-import { Parameter } from "./Models/Parameter.js";
-import { PositionCommandCompletionWindow, HighlightCompletionWindowItem } from "./CommandCompletion.js";
-import { PSCoreCommandResult } from "./Models/PSCoreCommandResult.js";
-import { CommandContext } from "./Models/CommandContext.js";
-import * as DataGrid from "./DataGrid.js";
-import { CreateCommandHarness, AddPSCoreResultsHarness, UpdateResultsCount, AddCommandResultsHarness } from "./ResultsParser.js";
-import { GenericCommandResult } from "./Models/GenericCommandResult.js";
 import { GetSelectedDevices } from "./DataGrid.js";
 
 
@@ -63,7 +51,6 @@ export function AddConsoleHTML(html: string) {
     ConsoleFrame.scrollTop = ConsoleFrame.scrollHeight;
 }
 export function AddTransferHarness(transferID: string, totalDevices:number) {
-    GetSelectedDevices()
     var transferHarness = document.createElement("div");
     transferHarness.id = transferID;
     transferHarness.classList.add("command-harness");