From 1aa4a26a26c12ab8909e07c7f599f0bcb716215b Mon Sep 17 00:00:00 2001
From: Jared <translucency@outlook.com>
Date: Wed, 9 Sep 2020 13:07:22 -0700
Subject: [PATCH] Add pagination.

---
 Desktop.Win/Program.cs                        |  12 +-
 Desktop.Win/Services/ShutdownServiceWin.cs    |   3 +-
 Server/Pages/_DataGrid.cshtml                 |  22 +-
 Server/wwwroot/scripts/Main/DataGrid.js       | 198 +++++++++------
 Server/wwwroot/scripts/Main/DataGrid.js.map   |   2 +-
 Server/wwwroot/scripts/Main/DataGrid.ts       | 228 +++++++++++-------
 Server/wwwroot/scripts/Main/HubConnection.js  |   6 +-
 .../wwwroot/scripts/Main/HubConnection.js.map |   2 +-
 Server/wwwroot/scripts/Main/HubConnection.ts  |   6 +-
 .../scripts/Main/InputEventHandlers.js        | 198 ++++++++-------
 .../scripts/Main/InputEventHandlers.js.map    |   2 +-
 .../scripts/Main/InputEventHandlers.ts        | 213 ++++++++--------
 Server/wwwroot/scripts/Main/UI.js             |   5 +
 Server/wwwroot/scripts/Main/UI.js.map         |   2 +-
 Server/wwwroot/scripts/Main/UI.ts             |   7 +-
 15 files changed, 549 insertions(+), 357 deletions(-)

diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
index cd75c0265..27361ed41 100644
--- a/Desktop.Win/Program.cs
+++ b/Desktop.Win/Program.cs
@@ -20,6 +20,7 @@ namespace Remotely.Desktop.Win
 {
     public class Program
 	{
+        public static ManualResetEvent AppExitEvent { get; } = new ManualResetEvent(false);
         public static Form BackgroundForm { get; private set; }
         private static CasterSocket CasterSocket { get; set; }
         private static Conductor Conductor { get; set; }
@@ -71,7 +72,16 @@ await Task.Run(async () =>
                     StartUiThreads(() => new MainWindow());
                 }
 
-                Thread.Sleep(Timeout.Infinite);
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    App.Current.Exit += (sender, exitArgs) =>
+                    {
+                        AppExitEvent.Set();
+                    };
+                });
+
+
+                AppExitEvent.WaitOne(Timeout.Infinite);
             }
             catch (Exception ex)
             {
diff --git a/Desktop.Win/Services/ShutdownServiceWin.cs b/Desktop.Win/Services/ShutdownServiceWin.cs
index b01ea218b..ed576ed59 100644
--- a/Desktop.Win/Services/ShutdownServiceWin.cs
+++ b/Desktop.Win/Services/ShutdownServiceWin.cs
@@ -20,7 +20,8 @@ public async Task Shutdown()
             await casterSocket.DisconnectAllViewers();
             System.Windows.Forms.Application.Exit();
             App.Current.Shutdown();
-            Environment.Exit(0);
+            // TODO: Still needed?
+            //Environment.Exit(0);
         }
     }
 }
diff --git a/Server/Pages/_DataGrid.cshtml b/Server/Pages/_DataGrid.cshtml
index 434bf19b2..1e7917c80 100644
--- a/Server/Pages/_DataGrid.cshtml
+++ b/Server/Pages/_DataGrid.cshtml
@@ -4,28 +4,41 @@
     <div id="deviceGridInnerWrapper">
         <div id="gridControlsWrapper">
             <div>
-                <div class="mb-2">
+                <div>
                     <label>Device Group:</label>
                     <select id="deviceGroupSelect" asp-items="Model.DeviceGroups" class="form-control" style="width: 200px">
                         <option value="">All</option>
                         <option value="">Ungrouped</option>
                     </select>
                 </div>
-                <div class="custom-control custom-checkbox">
+                <div class="custom-control custom-checkbox mt-2">
                     <input id="hideOfflineDevicesCheckbox" type="checkbox" class="custom-control-input" checked />
                     <label class="custom-control-label" for="hideOfflineDevicesCheckbox">Hide offline devices</label>
                 </div>
             </div>
             <div>
-                <div class="mb-2">
+                <div>
                     <button id="startRemoteControlButton" class="btn btn-sm btn-secondary mr-1">Remote Control</button>
                     <button id="toggleAllDevices" class="btn btn-sm btn-secondary">Select All</button>
                 </div>
 
-                <div>
+                <div class="mt-2">
                     <span class="mr-1">Filter:</span>
                     <input id="gridFilter" />
                 </div>
+
+                <div class="mt-2" style="white-space: nowrap">
+                    <button id="leftPaginationButton" class="btn btn-sm btn-secondary">
+                        <i class="fa fa-chevron-left"></i>
+                    </button>
+                    <span class="small">Page</span>
+                    <input id="currentPageInput" style="width:75px" pattern="[0-9]" />
+                    <span class="small">of</span>
+                    <span id="totalPagesSpan"></span>
+                    <button id="rightPaginationButton" class="btn btn-sm btn-secondary">
+                        <i class="fa fa-chevron-right"></i>
+                    </button>
+                </div>
             </div>
         </div>
         <div style="overflow-y: auto">
@@ -52,6 +65,5 @@
                 </tbody>
             </table>
         </div>
-       
     </div>
 </div>
\ No newline at end of file
diff --git a/Server/wwwroot/scripts/Main/DataGrid.js b/Server/wwwroot/scripts/Main/DataGrid.js
index 07164a0f4..309d0a4ae 100644
--- a/Server/wwwroot/scripts/Main/DataGrid.js
+++ b/Server/wwwroot/scripts/Main/DataGrid.js
@@ -1,20 +1,27 @@
-import { Main } from "./Main.js";
-import { DeviceGrid, DevicesSelectedCount, OnlineDevicesCount, TotalDevicesCount } from "./UI.js";
+import { DeviceGrid, DevicesSelectedCount, OnlineDevicesCount, TotalDevicesCount, TotalPagesSpan, DeviceGridBody, CurrentPageInput } from "./UI.js";
 import { AddConsoleOutput } from "./Console.js";
 import { CreateChatWindow } from "./Chat.js";
 import * as HubConnection from "./HubConnection.js";
 import { ShowModal } from "../Shared/UI.js";
 export const DataSource = new Array();
-export const FilterOptions = new class {
+export const FilteredDevices = new Array();
+export const GridState = new class {
     constructor() {
         this.GroupFilter = "";
         this.HideOffline = true;
         this.SearchFilter = "";
         this.ShowAllGroups = true;
+        this.CurrentPage = 1;
+        this.TotalPages = 1;
+    }
+    get RowsPerPage() {
+        return 100;
     }
 };
 export function AddOrUpdateDevices(devices) {
     DataSource.splice(0);
+    FilteredDevices.splice(0);
+    GridState.CurrentPage = 1;
     devices.sort((a, b) => {
         //if (a.IsOnline && !b.IsOnline) {
         //    return -1;
@@ -25,12 +32,12 @@ export function AddOrUpdateDevices(devices) {
         return a.DeviceName.localeCompare(b.DeviceName, [], { sensitivity: "base" });
     });
     devices.forEach(x => {
-        AddOrUpdateDevice(x);
+        AddOrUpdateDevice(x, false);
     });
-    ApplyFilter();
     UpdateDeviceCounts();
+    RenderDeviceRows();
 }
-export function AddOrUpdateDevice(device) {
+export function AddOrUpdateDevice(device, rerenderGrid) {
     var existingIndex = DataSource.findIndex(x => x.ID == device.ID);
     if (existingIndex > -1) {
         DataSource[existingIndex] = device;
@@ -38,28 +45,68 @@ export function AddOrUpdateDevice(device) {
     else {
         DataSource.push(device);
     }
-    var tableBody = document.querySelector("#" + Main.UI.DeviceGrid.id + " tbody");
-    var recordRow = document.getElementById(device.ID);
-    if (recordRow == null) {
-        recordRow = document.createElement("tr");
-        recordRow.classList.add("record-row");
-        recordRow.id = device.ID;
-        tableBody.appendChild(recordRow);
-        recordRow.addEventListener("click", (e) => {
-            if (!e.ctrlKey && !e.shiftKey) {
-                var selectedID = e.currentTarget.id;
-                DeviceGrid.querySelectorAll(`.record-row.row-selected:not([id='${selectedID}'])`).forEach(elem => {
-                    elem.classList.remove("row-selected");
-                });
-            }
-            e.currentTarget.classList.toggle("row-selected");
-            UpdateDeviceCounts();
-        });
+    ApplyFilterToDevice(device);
+    if (rerenderGrid) {
+        UpdateDeviceCounts();
+        RenderDeviceRows();
+    }
+}
+export function ApplyFilterToAll() {
+    FilteredDevices.splice(0);
+    GridState.CurrentPage = 1;
+    for (var i = 0; i < DataSource.length; i++) {
+        ApplyFilterToDevice(DataSource[i]);
+    }
+    UpdateDeviceCounts();
+    RenderDeviceRows();
+}
+export function ApplyFilterToDevice(device) {
+    if (GridState.HideOffline && !device.IsOnline) {
+        return;
+    }
+    if (!GridState.ShowAllGroups &&
+        (device.DeviceGroupID || "") != (GridState.GroupFilter || "")) {
+        return;
     }
-    recordRow.innerHTML = `
+    if (deviceMatchesSearchFilter(device)) {
+        var existingIndex = FilteredDevices.findIndex(x => x.ID == device.ID);
+        if (existingIndex > -1) {
+            FilteredDevices[existingIndex] = device;
+        }
+        else {
+            FilteredDevices.push(device);
+        }
+        return;
+    }
+}
+export function RenderDeviceRows() {
+    DeviceGridBody.innerHTML = "";
+    var startCurrentDevices = (GridState.CurrentPage - 1) * GridState.RowsPerPage;
+    var endCurrentDevices = startCurrentDevices + GridState.RowsPerPage;
+    var currentPageDevices = FilteredDevices.slice(startCurrentDevices, endCurrentDevices);
+    for (var i = 0; i < currentPageDevices.length; i++) {
+        var device = currentPageDevices[i];
+        var recordRow = document.getElementById(device.ID);
+        if (recordRow == null) {
+            recordRow = document.createElement("tr");
+            recordRow.classList.add("record-row");
+            recordRow.id = device.ID;
+            DeviceGridBody.appendChild(recordRow);
+            recordRow.addEventListener("click", (e) => {
+                if (!e.ctrlKey && !e.shiftKey) {
+                    var selectedID = e.currentTarget.id;
+                    DeviceGrid.querySelectorAll(`.record-row.row-selected:not([id='${selectedID}'])`).forEach(elem => {
+                        elem.classList.remove("row-selected");
+                    });
+                }
+                e.currentTarget.classList.toggle("row-selected");
+                UpdateDeviceCounts();
+            });
+        }
+        recordRow.innerHTML = `
                     <td>${String(device.IsOnline)
-        .replace("true", "<span class='fa fa-check-circle'></span>")
-        .replace("false", "<span class='fa fa-times'></span>")}</td>
+            .replace("true", "<span class='fa fa-check-circle'></span>")
+            .replace("false", "<span class='fa fa-times'></span>")}</td>
                     <td>${device.DeviceName}</td>
                     <td>${device.Alias || ""}</td>
                     <td>${device.CurrentUser}</td>
@@ -77,50 +124,24 @@ export function AddOrUpdateDevice(device) {
                         <i class="fas fa-mouse device-remotecontrol-button mr-2" title="Remote Control" style="font-size:1.5em"></i>
                         <i class="fas fa-edit device-edit-button" title="Edit" style="font-size:1.5em"></i>
                     </td>`;
-    recordRow.querySelector(".device-edit-button").onclick = (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        window.open(`${location.origin}/EditDevice?deviceID=${device.ID}`, "_blank");
-    };
-    recordRow.querySelector(".device-chat-button").onclick = (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        CreateChatWindow(device.ID, device.DeviceName);
-    };
-    recordRow.querySelector(".device-remotecontrol-button").onclick = (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        AddConsoleOutput("Launching remote control on client device...");
-        HubConnection.Connection.invoke("RemoteControl", device.ID);
-    };
-    UpdateDeviceCounts();
-}
-export function ApplyFilter() {
-    for (var i = 0; i < DataSource.length; i++) {
-        var row = document.getElementById(DataSource[i].ID);
-        if (FilterOptions.HideOffline && !DataSource[i].IsOnline) {
-            row.classList.add("hidden");
-            continue;
-        }
-        if (!FilterOptions.ShowAllGroups &&
-            (DataSource[i].DeviceGroupID || "") != (FilterOptions.GroupFilter || "")) {
-            row.classList.add("hidden");
-            continue;
-        }
-        if (deviceMatchesSearchFilter(DataSource[i])) {
-            row.classList.remove("hidden");
-            continue;
-        }
-        row.classList.add("hidden");
+        recordRow.querySelector(".device-edit-button").onclick = (ev) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+            window.open(`${location.origin}/EditDevice?deviceID=${device.ID}`, "_blank");
+        };
+        recordRow.querySelector(".device-chat-button").onclick = (ev) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+            CreateChatWindow(device.ID, device.DeviceName);
+        };
+        recordRow.querySelector(".device-remotecontrol-button").onclick = (ev) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+            AddConsoleOutput("Launching remote control on client device...");
+            HubConnection.Connection.invoke("RemoteControl", device.ID);
+        };
     }
 }
-export function ClearAllData() {
-    DataSource.splice(0, DataSource.length);
-    DeviceGrid.querySelectorAll(".record-row").forEach(row => {
-        row.remove();
-    });
-    UpdateDeviceCounts();
-}
 export function GetSelectedDevices() {
     var devices = new Array();
     DeviceGrid.querySelectorAll(".row-selected").forEach(row => {
@@ -129,8 +150,34 @@ export function GetSelectedDevices() {
     return devices;
 }
 ;
+export function GoToCurrentPage() {
+    var newPage = Number(CurrentPageInput.value);
+    if (Number.isInteger(newPage) &&
+        newPage > 0 &&
+        newPage < GridState.TotalPages) {
+        GridState.CurrentPage = newPage;
+        UpdateDeviceCounts();
+        RenderDeviceRows();
+    }
+}
+export function PageDown() {
+    if (GridState.CurrentPage > 1) {
+        GridState.CurrentPage--;
+        UpdateDeviceCounts();
+        RenderDeviceRows();
+    }
+}
+export function PageUp() {
+    if (GridState.CurrentPage < GridState.TotalPages) {
+        GridState.CurrentPage++;
+        UpdateDeviceCounts();
+        RenderDeviceRows();
+    }
+}
 export function RefreshGrid() {
-    ClearAllData();
+    DataSource.splice(0);
+    DeviceGridBody.innerHTML = "";
+    UpdateDeviceCounts();
     var xhr = new XMLHttpRequest();
     xhr.open("get", "/API/Devices");
     xhr.onerror = () => {
@@ -171,17 +218,20 @@ export function ToggleSelectAll() {
     UpdateDeviceCounts();
 }
 export function UpdateDeviceCounts() {
+    GridState.TotalPages = Math.ceil(FilteredDevices.length / GridState.RowsPerPage);
+    TotalPagesSpan.innerHTML = String(GridState.TotalPages);
+    CurrentPageInput.value = String(GridState.CurrentPage);
     DevicesSelectedCount.innerText = DeviceGrid.querySelectorAll(".row-selected").length.toString();
-    OnlineDevicesCount.innerText = DataSource.filter(x => x.IsOnline).length.toString();
-    TotalDevicesCount.innerText = DataSource.length.toString();
-    if (DataSource.some(x => !x.IsOnline &&
+    OnlineDevicesCount.innerText = FilteredDevices.filter(x => x.IsOnline).length.toString();
+    TotalDevicesCount.innerText = FilteredDevices.length.toString();
+    if (FilteredDevices.some(x => !x.IsOnline &&
         document.getElementById(x.ID) &&
         document.getElementById(x.ID).classList.contains("row-selected"))) {
         AddConsoleOutput(`Your selection contains offline computers.  Your commands will only be sent to those that are online.`);
     }
 }
 function deviceMatchesSearchFilter(device) {
-    if (!FilterOptions.SearchFilter) {
+    if (!GridState.SearchFilter) {
         return true;
     }
     for (var key in device) {
@@ -189,7 +239,7 @@ function deviceMatchesSearchFilter(device) {
         if (!value) {
             continue;
         }
-        if (value.toString().toLowerCase().includes(FilterOptions.SearchFilter.toLowerCase())) {
+        if (value.toString().toLowerCase().includes(GridState.SearchFilter.toLowerCase())) {
             return true;
         }
     }
diff --git a/Server/wwwroot/scripts/Main/DataGrid.js.map b/Server/wwwroot/scripts/Main/DataGrid.js.map
index bbb5dc88b..128bd7344 100644
--- a/Server/wwwroot/scripts/Main/DataGrid.js.map
+++ b/Server/wwwroot/scripts/Main/DataGrid.js.map
@@ -1 +1 @@
-{"version":3,"file":"DataGrid.js","sourceRoot":"","sources":["DataGrid.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"DataGrid.js","sourceRoot":"","sources":["DataGrid.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Server/wwwroot/scripts/Main/DataGrid.ts b/Server/wwwroot/scripts/Main/DataGrid.ts
index e88c370d1..39ac68a46 100644
--- a/Server/wwwroot/scripts/Main/DataGrid.ts
+++ b/Server/wwwroot/scripts/Main/DataGrid.ts
@@ -1,24 +1,32 @@
-import { Device } from "../Shared/Models/Device.js";
-import { Main } from "./Main.js";
-import { DeviceGrid, DevicesSelectedCount, OnlineDevicesCount, TotalDevicesCount } from "./UI.js";
+import { Main } from "./Main.js";
+import { DeviceGrid, DevicesSelectedCount, OnlineDevicesCount, TotalDevicesCount, TotalPagesSpan, DeviceGridBody, CurrentPageInput } from "./UI.js";
 import { AddConsoleOutput } from "./Console.js";
 import { CreateChatWindow } from "./Chat.js";
 import * as HubConnection from "./HubConnection.js"
 import { ShowModal } from "../Shared/UI.js";
+import { Device } from "../Shared/Models/Device.js";
 
 
 export const DataSource: Array<Device> = new Array<Device>();
+export const FilteredDevices: Array<Device> = new Array<Device>();
 
-export const FilterOptions = new class {
+export const GridState = new class {
     GroupFilter: string = "";
     HideOffline: boolean = true;
     SearchFilter: string = "";
     ShowAllGroups: boolean = true;
+    CurrentPage: number = 1;
+    TotalPages: number = 1;
+    get RowsPerPage() {
+        return 100;
+    }
 };
 
 
 export function AddOrUpdateDevices(devices: Array<Device>) {
     DataSource.splice(0);
+    FilteredDevices.splice(0);
+    GridState.CurrentPage = 1;
 
     devices.sort((a, b) => {
         //if (a.IsOnline && !b.IsOnline) {
@@ -31,14 +39,14 @@ export function AddOrUpdateDevices(devices: Array<Device>) {
     });
 
     devices.forEach(x => {
-        AddOrUpdateDevice(x);
+        AddOrUpdateDevice(x, false);
     });
 
-    ApplyFilter();
     UpdateDeviceCounts();
+    RenderDeviceRows();
 }
 
-export function AddOrUpdateDevice(device: Device) {
+export function AddOrUpdateDevice(device: Device, rerenderGrid: boolean) {
     var existingIndex = DataSource.findIndex(x => x.ID == device.ID);
     if (existingIndex > -1) {
         DataSource[existingIndex] = device;
@@ -47,29 +55,83 @@ export function AddOrUpdateDevice(device: Device) {
         DataSource.push(device);
     }
 
-    var tableBody = document.querySelector("#" + Main.UI.DeviceGrid.id + " tbody");
-    var recordRow = document.getElementById(device.ID);
-    if (recordRow == null) {
-        recordRow = document.createElement("tr");
-        recordRow.classList.add("record-row");
-        recordRow.id = device.ID;
-        tableBody.appendChild(recordRow);
-        recordRow.addEventListener("click", (e) => {
-            if (!e.ctrlKey && !e.shiftKey) {
-                var selectedID = (e.currentTarget as HTMLElement).id;
-                DeviceGrid.querySelectorAll(`.record-row.row-selected:not([id='${selectedID}'])`).forEach(elem => {
-                    elem.classList.remove("row-selected");
-                });
-            }
-            (e.currentTarget as HTMLElement).classList.toggle("row-selected");
-            UpdateDeviceCounts();
-        });
+    ApplyFilterToDevice(device);
+
+    if (rerenderGrid) {
+        UpdateDeviceCounts();
+        RenderDeviceRows();
+    }
+}
+
+export function ApplyFilterToAll() {
+    FilteredDevices.splice(0);
+    GridState.CurrentPage = 1;
+
+    for (var i = 0; i < DataSource.length; i++) {
+        ApplyFilterToDevice(DataSource[i]);
+    }
+
+    UpdateDeviceCounts();
+    RenderDeviceRows();
+}
+
+export function ApplyFilterToDevice(device: Device) {
+
+    if (GridState.HideOffline && !device.IsOnline) {
+        return;
+    }
+
+    if (!GridState.ShowAllGroups &&
+        (device.DeviceGroupID || "") != (GridState.GroupFilter || "")) {
+        return;
+    }
+
+    if (deviceMatchesSearchFilter(device)) {
+        var existingIndex = FilteredDevices.findIndex(x => x.ID == device.ID);
+
+        if (existingIndex > -1) {
+            FilteredDevices[existingIndex] = device;
+        }
+        else {
+            FilteredDevices.push(device);
+        }
+        
+        return;
     }
+}
 
-    recordRow.innerHTML = `
+export function RenderDeviceRows() {
+    DeviceGridBody.innerHTML = "";
+    var startCurrentDevices = (GridState.CurrentPage - 1) * GridState.RowsPerPage;
+    var endCurrentDevices = startCurrentDevices + GridState.RowsPerPage;
+
+    var currentPageDevices = FilteredDevices.slice(startCurrentDevices, endCurrentDevices);
+
+    for (var i = 0; i < currentPageDevices.length; i++) {
+
+        var device = currentPageDevices[i];
+        var recordRow = document.getElementById(device.ID) as HTMLTableRowElement;
+        if (recordRow == null) {
+            recordRow = document.createElement("tr");
+            recordRow.classList.add("record-row");
+            recordRow.id = device.ID;
+            DeviceGridBody.appendChild(recordRow);
+            recordRow.addEventListener("click", (e) => {
+                if (!e.ctrlKey && !e.shiftKey) {
+                    var selectedID = (e.currentTarget as HTMLElement).id;
+                    DeviceGrid.querySelectorAll(`.record-row.row-selected:not([id='${selectedID}'])`).forEach(elem => {
+                        elem.classList.remove("row-selected");
+                    });
+                }
+                (e.currentTarget as HTMLElement).classList.toggle("row-selected");
+                UpdateDeviceCounts();
+            });
+        }
+
+        recordRow.innerHTML = `
                     <td>${String(device.IsOnline)
-                            .replace("true", "<span class='fa fa-check-circle'></span>")
-                            .replace("false", "<span class='fa fa-times'></span>")}</td>
+                .replace("true", "<span class='fa fa-check-circle'></span>")
+                .replace("false", "<span class='fa fa-times'></span>")}</td>
                     <td>${device.DeviceName}</td>
                     <td>${device.Alias || ""}</td>
                     <td>${device.CurrentUser}</td>
@@ -80,7 +142,7 @@ export function AddOrUpdateDevice(device: Device) {
                     <td>${Math.round(device.CpuUtilization * 100)}%</td>
                     <td>${Math.round(device.UsedStorage / device.TotalStorage * 100)}%</td>
                     <td>${device.TotalStorage.toLocaleString()}</td>
-                    <td>${Math.round(device.UsedMemory /device.TotalMemory * 100)}%</td>
+                    <td>${Math.round(device.UsedMemory / device.TotalMemory * 100)}%</td>
                     <td>${device.TotalMemory.toLocaleString()}</td>
                     <td style="white-space: nowrap">
                         <i class="fas fa-comment device-chat-button mr-2" title="Chat" style="font-size:1.5em"></i>
@@ -89,56 +151,26 @@ export function AddOrUpdateDevice(device: Device) {
                     </td>`;
 
 
-    (recordRow.querySelector(".device-edit-button") as HTMLButtonElement).onclick = (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        window.open(`${location.origin}/EditDevice?deviceID=${device.ID}`, "_blank");
-    };
-    (recordRow.querySelector(".device-chat-button") as HTMLButtonElement).onclick = (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        CreateChatWindow(device.ID, device.DeviceName);
-    };
-    (recordRow.querySelector(".device-remotecontrol-button") as HTMLButtonElement).onclick = (ev) => {
-        ev.preventDefault();
-        ev.stopPropagation();
-        AddConsoleOutput("Launching remote control on client device...");
-        HubConnection.Connection.invoke("RemoteControl", device.ID);
-    };
-
-    UpdateDeviceCounts();
-}
-export function ApplyFilter() {
-    for (var i = 0; i < DataSource.length; i++) {
-        var row = document.getElementById(DataSource[i].ID);
-
-        if (FilterOptions.HideOffline && !DataSource[i].IsOnline) {
-            row.classList.add("hidden");
-            continue;
-        }
-
-        if (!FilterOptions.ShowAllGroups &&
-            (DataSource[i].DeviceGroupID || "") != (FilterOptions.GroupFilter || "")) {
-            row.classList.add("hidden");
-            continue;
-        }
-
-        if (deviceMatchesSearchFilter(DataSource[i])) {
-            row.classList.remove("hidden");
-            continue;
-        }
-
-        row.classList.add("hidden");
+        (recordRow.querySelector(".device-edit-button") as HTMLButtonElement).onclick = (ev) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+            window.open(`${location.origin}/EditDevice?deviceID=${device.ID}`, "_blank");
+        };
+        (recordRow.querySelector(".device-chat-button") as HTMLButtonElement).onclick = (ev) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+            CreateChatWindow(device.ID, device.DeviceName);
+        };
+        (recordRow.querySelector(".device-remotecontrol-button") as HTMLButtonElement).onclick = (ev) => {
+            ev.preventDefault();
+            ev.stopPropagation();
+            AddConsoleOutput("Launching remote control on client device...");
+            HubConnection.Connection.invoke("RemoteControl", device.ID);
+        };
     }
 }
 
-export function ClearAllData() {
-    DataSource.splice(0, DataSource.length);
-    DeviceGrid.querySelectorAll(".record-row").forEach(row => {
-        row.remove();
-    });
-    UpdateDeviceCounts();
-}
+
 export function GetSelectedDevices(): Device[] {
     var devices = new Array<Device>();
     DeviceGrid.querySelectorAll(".row-selected").forEach(row => {
@@ -146,8 +178,39 @@ export function GetSelectedDevices(): Device[] {
     });
     return devices;
 };
+
+export function GoToCurrentPage() {
+    var newPage = Number(CurrentPageInput.value);
+
+    if (Number.isInteger(newPage) &&
+        newPage > 0 &&
+        newPage < GridState.TotalPages) {
+        GridState.CurrentPage = newPage;
+        UpdateDeviceCounts();
+        RenderDeviceRows();
+    }
+}
+
+export function PageDown() {
+    if (GridState.CurrentPage > 1) {
+        GridState.CurrentPage--;
+        UpdateDeviceCounts();
+        RenderDeviceRows();
+    }
+}
+
+export function PageUp() {
+    if (GridState.CurrentPage < GridState.TotalPages) {
+        GridState.CurrentPage++;
+        UpdateDeviceCounts();
+        RenderDeviceRows();
+    }
+}
+
 export function RefreshGrid() {
-    ClearAllData();
+    DataSource.splice(0);
+    DeviceGridBody.innerHTML = "";
+    UpdateDeviceCounts();
     var xhr = new XMLHttpRequest();
     xhr.open("get", "/API/Devices");
     xhr.onerror = () => {
@@ -189,11 +252,14 @@ export function ToggleSelectAll() {
     UpdateDeviceCounts();
 }
 export function UpdateDeviceCounts() {
+    GridState.TotalPages = Math.ceil(FilteredDevices.length / GridState.RowsPerPage);
+    TotalPagesSpan.innerHTML = String(GridState.TotalPages);
+    CurrentPageInput.value = String(GridState.CurrentPage);
     DevicesSelectedCount.innerText = DeviceGrid.querySelectorAll(".row-selected").length.toString();
-    OnlineDevicesCount.innerText = DataSource.filter(x => x.IsOnline).length.toString();
-    TotalDevicesCount.innerText = DataSource.length.toString();
+    OnlineDevicesCount.innerText = FilteredDevices.filter(x => x.IsOnline).length.toString();
+    TotalDevicesCount.innerText = FilteredDevices.length.toString();
     if (
-        DataSource.some(x =>
+        FilteredDevices.some(x =>
             !x.IsOnline &&
             document.getElementById(x.ID) &&
             document.getElementById(x.ID).classList.contains("row-selected"))
@@ -203,7 +269,7 @@ export function UpdateDeviceCounts() {
 }
 
 function deviceMatchesSearchFilter(device: Device) {
-    if (!FilterOptions.SearchFilter) {
+    if (!GridState.SearchFilter) {
         return true;
     }
 
@@ -212,7 +278,7 @@ function deviceMatchesSearchFilter(device: Device) {
         if (!value) {
             continue;
         }
-        if (value.toString().toLowerCase().includes(FilterOptions.SearchFilter.toLowerCase())) {
+        if (value.toString().toLowerCase().includes(GridState.SearchFilter.toLowerCase())) {
             return true;
         }
     }
diff --git a/Server/wwwroot/scripts/Main/HubConnection.js b/Server/wwwroot/scripts/Main/HubConnection.js
index 95fd2dac6..1063c0c4a 100644
--- a/Server/wwwroot/scripts/Main/HubConnection.js
+++ b/Server/wwwroot/scripts/Main/HubConnection.js
@@ -51,13 +51,13 @@ function applyMessageHandlers(hubConnection) {
         location.assign("/Identity/Account/Lockout");
     });
     hubConnection.on("DeviceCameOnline", (device) => {
-        DataGrid.AddOrUpdateDevice(device);
+        DataGrid.AddOrUpdateDevice(device, true);
     });
     hubConnection.on("DeviceWentOffline", (device) => {
-        DataGrid.AddOrUpdateDevice(device);
+        DataGrid.AddOrUpdateDevice(device, true);
     });
     hubConnection.on("DeviceHeartbeat", (device) => {
-        DataGrid.AddOrUpdateDevice(device);
+        DataGrid.AddOrUpdateDevice(device, true);
     });
     hubConnection.on("RefreshDeviceList", () => {
         DataGrid.RefreshGrid();
diff --git a/Server/wwwroot/scripts/Main/HubConnection.js.map b/Server/wwwroot/scripts/Main/HubConnection.js.map
index f590cbdcd..6c4e81aec 100644
--- a/Server/wwwroot/scripts/Main/HubConnection.js.map
+++ b/Server/wwwroot/scripts/Main/HubConnection.js.map
@@ -1 +1 @@
-{"version":3,"file":"HubConnection.js","sourceRoot":"","sources":["HubConnection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAK1C,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAEjI,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGzD,MAAM,CAAC,IAAI,UAAe,CAAC;AAC3B,MAAM,CAAC,IAAI,SAAiB,CAAC;AAC7B,MAAM,CAAC,IAAI,SAAkB,CAAC;AAE9B,MAAM,UAAU,OAAO;IACnB,IAAI,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;IAChC,UAAU,GAAG,IAAI,OAAO,CAAC,oBAAoB,EAAE;SAC1C,OAAO,CAAC,aAAa,CAAC;SACtB,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;SAC9C,KAAK,EAAE,CAAC;IAEb,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEjC,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QAC3B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9B,SAAS,GAAG,KAAK,CAAC;QAClB,gBAAgB,CAAC,8EAA8E,CAAC,CAAC;IACrG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QACT,SAAS,GAAG,IAAI,CAAC;IACrB,CAAC,CAAC,CAAA;IACF,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QACxC,SAAS,GAAG,KAAK,CAAC;QAClB,SAAS,CAAC,oBAAoB,EAC1B,mEAAmE,EACnE,gGAAgG,CAAC,CAAC;QACtG,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC;AAAA,CAAC;AAEF,SAAS,oBAAoB,CAAC,aAAa;IACvC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,QAAgB,EAAE,UAAkB,EAAE,OAAe,EAAE,YAAqB,EAAE,EAAE;QACtG,IAAI,YAAY,EAAE;YACd,cAAc,CAAC,uCAAuC,UAAU,iCAAiC,CAAC,CAAC;SACtG;aACI,IAAI,OAAO,EAAE;YACd,cAAc,CAAC,sDAAsD,UAAU,YAAY,OAAO,EAAE,CAAC,CAAC;SACzG;QAED,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,OAAoB,EAAE,EAAE;QACrD,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC5E,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;QAClF,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,KAAK,GAAG,OAAO,CAAC,wBAAwB,CAAC;QAChF,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,IAAI,GAAG,OAAO,CAAC,uBAAuB,CAAC;QAC9E,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC5E,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;QACvC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;QACnC,QAAQ,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,MAAa,EAAE,EAAE;QACnD,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,MAAc,EAAE,EAAE;QACrD,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,MAAc,EAAE,EAAE;QACnD,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACvC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,MAA2B,EAAE,EAAE;QAC7D,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAChC,kBAAkB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,MAA4B,EAAE,EAAE;QAC/D,wBAAwB,CAAC,MAAM,CAAC,CAAC;QACjC,kBAAkB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,cAAsB,EAAE,YAAoB,EAAE,EAAE;QAChF,IAAI,cAAc,EAAE;YAChB,gBAAgB,CAAC,cAAc,CAAC,CAAC;SACpC;QACD,IAAI,YAAY,EAAE;YACd,WAAW,CAAC,YAAY,CAAC,CAAC;SAC7B;IACL,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,OAAe,EAAE,EAAE;QACvD,cAAc,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,MAAc,EAAE,EAAE;QAChD,QAAQ,CAAC,MAAM,CAAC,oBAAoB,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,sBAAsB,EAAE,CAAC,eAAuB,EAAE,EAAE;QACjE,gBAAgB,CAAC,oCAAoC,eAAe,GAAG,CAAC,CAAA;IAC5E,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,UAAkB,EAAE,EAAE;QACzD,IAAI,gBAAgB,GAAG,QAAQ,CAAC,cAAc,CAAC,UAAU,GAAG,YAAY,CAAC,CAAC;QAC1E,IAAI,KAAK,GAAG,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACjD,gBAAgB,CAAC,SAAS,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACxD,CAAC,CAAC,CAAA;IACF,aAAa,CAAC,EAAE,CAAC,qBAAqB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QAC5E,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,8BAA8B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACxF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACtD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QAC3E,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,6BAA6B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACvF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QACzE,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,8BAA8B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACxF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;QAC1E,IAAI,SAAS,GAAG,GAAG,QAAQ,CAAC,MAAM,8BAA8B,SAAS,IAAI,QAAQ,EAAE,CAAC;QACxF,IAAI,GAAG,GAAG,IAAI,cAAc,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3B,GAAG,CAAC,MAAM,GAAG;YACT,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE;gBACnB,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvD,kBAAkB,CAAC,SAAS,CAAC,CAAC;aACjC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,IAAI,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,sBAAsB,EAAE,CAAC,MAAqB,EAAE,EAAE;QAC/D,cAAc,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,SAAiB,EAAE,EAAE;QAChD,SAAS,GAAG,SAAS,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,EAAE,CAAC,wBAAwB,EAAE,CAAC,cAAsB,EAAE,EAAE;QAClE,MAAM,CAAC,IAAI,CAAC,2BAA2B,cAAc,cAAc,SAAS,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;AACP,CAAC"}
\ No newline at end of file
+{"version":3,"file":"HubConnection.js","sourceRoot":"","sources":["HubConnection.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Server/wwwroot/scripts/Main/HubConnection.ts b/Server/wwwroot/scripts/Main/HubConnection.ts
index c0b6edb78..e4afe9e46 100644
--- a/Server/wwwroot/scripts/Main/HubConnection.ts
+++ b/Server/wwwroot/scripts/Main/HubConnection.ts
@@ -66,13 +66,13 @@ function applyMessageHandlers(hubConnection) {
     });
 
     hubConnection.on("DeviceCameOnline", (device:Device) => {
-        DataGrid.AddOrUpdateDevice(device);
+        DataGrid.AddOrUpdateDevice(device, true);
     });
     hubConnection.on("DeviceWentOffline", (device: Device) => {
-        DataGrid.AddOrUpdateDevice(device);
+        DataGrid.AddOrUpdateDevice(device, true);
     });
     hubConnection.on("DeviceHeartbeat", (device: Device) => {
-        DataGrid.AddOrUpdateDevice(device);
+        DataGrid.AddOrUpdateDevice(device, true);
     });
 
     hubConnection.on("RefreshDeviceList", () => {
diff --git a/Server/wwwroot/scripts/Main/InputEventHandlers.js b/Server/wwwroot/scripts/Main/InputEventHandlers.js
index 05ee4d6e2..d4e7c5d64 100644
--- a/Server/wwwroot/scripts/Main/InputEventHandlers.js
+++ b/Server/wwwroot/scripts/Main/InputEventHandlers.js
@@ -17,14 +17,53 @@ export function ApplyInputEventHandlers() {
     deviceGroupSelectChanged();
     addAlertHandlers();
     hideOfflineDevicesCheckboxChanged();
+    addGridPaginationHandlers();
     window.addEventListener("resize", ev => {
         PositionCommandCompletionWindow();
     });
 }
-function hideOfflineDevicesCheckboxChanged() {
-    UI.HideOfflineDevicesCheckbox.addEventListener("change", ev => {
-        DataGrid.FilterOptions.HideOffline = UI.HideOfflineDevicesCheckbox.checked;
-        DataGrid.ApplyFilter();
+function addGridPaginationHandlers() {
+    UI.LeftPaginationButton.addEventListener("click", (ev) => {
+        DataGrid.PageDown();
+    });
+    UI.RightPaginationButton.addEventListener("click", (ev) => {
+        DataGrid.PageUp();
+    });
+    var changePageTimeout = -1;
+    UI.CurrentPageInput.addEventListener("input", (ev) => {
+        if (changePageTimeout > 0) {
+            window.clearTimeout(changePageTimeout);
+        }
+        changePageTimeout = window.setTimeout(() => {
+            DataGrid.GoToCurrentPage();
+        }, 2000);
+    });
+}
+function addAlertHandlers() {
+    UI.AlertsButton.addEventListener("click", ev => {
+        UI.AlertsFrame.classList.toggle("open");
+    });
+    UI.CloseAlertsButton.addEventListener("click", ev => {
+        UI.AlertsFrame.classList.toggle("open");
+    });
+    document.querySelectorAll(".alert-dismiss-button").forEach(element => {
+        element.addEventListener("click", ev => {
+            var alertID = ev.currentTarget.getAttribute("alert");
+            var xhr = new XMLHttpRequest();
+            xhr.open("delete", location.origin + "/api/Alerts/Delete/" + alertID);
+            xhr.onload = function () {
+                if (xhr.status == 200) {
+                    document.getElementById(alertID).remove();
+                    var currentCount = Number(UI.AlertsCount.innerText);
+                    currentCount--;
+                    UI.AlertsCount.innerText = String(currentCount);
+                }
+                else {
+                    ShowModal("API Error", "There was an error deleting the alert.");
+                }
+            };
+            xhr.send();
+        });
     });
 }
 function arrowUpOrDownOnTextArea(e) {
@@ -69,6 +108,71 @@ function arrowUpOrDownOnTextArea(e) {
         }
     }
 }
+function clickToggleAllDevices() {
+    document.getElementById("toggleAllDevices").addEventListener("click", function (e) {
+        DataGrid.ToggleSelectAll();
+    });
+}
+function clickStartRemoteControlButton() {
+    document.getElementById("startRemoteControlButton").addEventListener("click", function (e) {
+        var selectedDevices = DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            ShowMessage("You must select a device first.");
+        }
+        else if (selectedDevices.length > 1) {
+            ShowMessage("You must select only one device to control.");
+        }
+        else {
+            WebCommands.find(x => x.Name == "RemoteControl").Execute([]);
+        }
+    });
+}
+function consoleTabSelected() {
+    $(UI.ConsoleTab).on("shown.bs.tab", () => {
+        UI.ConsoleAlert.hidden = true;
+        UI.ConsoleAlert.innerText = "0";
+        UI.ConsoleFrame.scrollTop = UI.ConsoleFrame.scrollHeight;
+    });
+}
+function deviceGroupSelectChanged() {
+    UI.DeviceGroupSelect.addEventListener("change", (ev) => {
+        DataGrid.GridState.GroupFilter = UI.DeviceGroupSelect.value;
+        if (UI.DeviceGroupSelect.selectedIndex == 0) {
+            DataGrid.GridState.ShowAllGroups = true;
+        }
+        else {
+            DataGrid.GridState.ShowAllGroups = false;
+        }
+        DataGrid.ApplyFilterToAll();
+    });
+}
+function hideOfflineDevicesCheckboxChanged() {
+    UI.HideOfflineDevicesCheckbox.addEventListener("change", ev => {
+        DataGrid.GridState.HideOffline = UI.HideOfflineDevicesCheckbox.checked;
+        DataGrid.ApplyFilterToAll();
+    });
+}
+function inputOnCommandTextArea() {
+    UI.ConsoleTextArea.addEventListener("input", (e) => {
+        var commandMode = CommandProcessor.GetCommandModeShortcut();
+        if (commandMode) {
+            UI.CommandModeSelect.value = commandMode;
+            UI.ConsoleTextArea.value = "";
+            UI.CommandCompletionDiv.classList.add("hidden");
+        }
+        else {
+            CommandProcessor.EvaluateCurrentCommandText();
+        }
+        UI.ConsoleFrame.scrollTop = UI.ConsoleFrame.scrollHeight;
+    });
+}
+function inputOnFilterTextBox() {
+    UI.GridFilter.addEventListener("input", (e) => {
+        var currentText = e.currentTarget.value.toLowerCase();
+        DataGrid.GridState.SearchFilter = currentText;
+        DataGrid.ApplyFilterToAll();
+    });
+}
 function keyDownOnInputTextArea() {
     UI.ConsoleTextArea.addEventListener("keydown", function (e) {
         if (!e.shiftKey) {
@@ -137,90 +241,4 @@ function keyDownOnWindow() {
         }
     });
 }
-function inputOnCommandTextArea() {
-    UI.ConsoleTextArea.addEventListener("input", (e) => {
-        var commandMode = CommandProcessor.GetCommandModeShortcut();
-        if (commandMode) {
-            UI.CommandModeSelect.value = commandMode;
-            UI.ConsoleTextArea.value = "";
-            UI.CommandCompletionDiv.classList.add("hidden");
-        }
-        else {
-            CommandProcessor.EvaluateCurrentCommandText();
-        }
-        UI.ConsoleFrame.scrollTop = UI.ConsoleFrame.scrollHeight;
-    });
-}
-function inputOnFilterTextBox() {
-    UI.GridFilter.addEventListener("input", (e) => {
-        var currentText = e.currentTarget.value.toLowerCase();
-        DataGrid.FilterOptions.SearchFilter = currentText;
-        DataGrid.ApplyFilter();
-    });
-}
-function consoleTabSelected() {
-    $(UI.ConsoleTab).on("shown.bs.tab", () => {
-        UI.ConsoleAlert.hidden = true;
-        UI.ConsoleAlert.innerText = "0";
-        UI.ConsoleFrame.scrollTop = UI.ConsoleFrame.scrollHeight;
-    });
-}
-function addAlertHandlers() {
-    UI.AlertsButton.addEventListener("click", ev => {
-        UI.AlertsFrame.classList.toggle("open");
-    });
-    UI.CloseAlertsButton.addEventListener("click", ev => {
-        UI.AlertsFrame.classList.toggle("open");
-    });
-    document.querySelectorAll(".alert-dismiss-button").forEach(element => {
-        element.addEventListener("click", ev => {
-            var alertID = ev.currentTarget.getAttribute("alert");
-            var xhr = new XMLHttpRequest();
-            xhr.open("delete", location.origin + "/api/Alerts/Delete/" + alertID);
-            xhr.onload = function () {
-                if (xhr.status == 200) {
-                    document.getElementById(alertID).remove();
-                    var currentCount = Number(UI.AlertsCount.innerText);
-                    currentCount--;
-                    UI.AlertsCount.innerText = String(currentCount);
-                }
-                else {
-                    ShowModal("API Error", "There was an error deleting the alert.");
-                }
-            };
-            xhr.send();
-        });
-    });
-}
-function clickToggleAllDevices() {
-    document.getElementById("toggleAllDevices").addEventListener("click", function (e) {
-        DataGrid.ToggleSelectAll();
-    });
-}
-function clickStartRemoteControlButton() {
-    document.getElementById("startRemoteControlButton").addEventListener("click", function (e) {
-        var selectedDevices = DataGrid.GetSelectedDevices();
-        if (selectedDevices.length == 0) {
-            ShowMessage("You must select a device first.");
-        }
-        else if (selectedDevices.length > 1) {
-            ShowMessage("You must select only one device to control.");
-        }
-        else {
-            WebCommands.find(x => x.Name == "RemoteControl").Execute([]);
-        }
-    });
-}
-function deviceGroupSelectChanged() {
-    UI.DeviceGroupSelect.addEventListener("change", (ev) => {
-        DataGrid.FilterOptions.GroupFilter = UI.DeviceGroupSelect.value;
-        if (UI.DeviceGroupSelect.selectedIndex == 0) {
-            DataGrid.FilterOptions.ShowAllGroups = true;
-        }
-        else {
-            DataGrid.FilterOptions.ShowAllGroups = false;
-        }
-        DataGrid.ApplyFilter();
-    });
-}
 //# sourceMappingURL=InputEventHandlers.js.map
\ No newline at end of file
diff --git a/Server/wwwroot/scripts/Main/InputEventHandlers.js.map b/Server/wwwroot/scripts/Main/InputEventHandlers.js.map
index 73d14460d..134c4aecc 100644
--- a/Server/wwwroot/scripts/Main/InputEventHandlers.js.map
+++ b/Server/wwwroot/scripts/Main/InputEventHandlers.js.map
@@ -1 +1 @@
-{"version":3,"file":"InputEventHandlers.js","sourceRoot":"","sources":["InputEventHandlers.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"InputEventHandlers.js","sourceRoot":"","sources":["InputEventHandlers.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Server/wwwroot/scripts/Main/InputEventHandlers.ts b/Server/wwwroot/scripts/Main/InputEventHandlers.ts
index bb9f6ba8f..fce4929db 100644
--- a/Server/wwwroot/scripts/Main/InputEventHandlers.ts
+++ b/Server/wwwroot/scripts/Main/InputEventHandlers.ts
@@ -19,16 +19,59 @@ export function ApplyInputEventHandlers() {
     deviceGroupSelectChanged();
     addAlertHandlers();
     hideOfflineDevicesCheckboxChanged();
+    addGridPaginationHandlers();
 
     window.addEventListener("resize", ev => {
         PositionCommandCompletionWindow();
     });
 }
 
-function hideOfflineDevicesCheckboxChanged() {
-    UI.HideOfflineDevicesCheckbox.addEventListener("change", ev => {
-        DataGrid.FilterOptions.HideOffline = UI.HideOfflineDevicesCheckbox.checked;
-        DataGrid.ApplyFilter();
+function addGridPaginationHandlers() {
+    UI.LeftPaginationButton.addEventListener("click", (ev) => {
+        DataGrid.PageDown();
+    });
+
+    UI.RightPaginationButton.addEventListener("click", (ev) => {
+        DataGrid.PageUp();
+    });
+
+    var changePageTimeout = -1;
+    UI.CurrentPageInput.addEventListener("input", (ev) => {
+        if (changePageTimeout > 0) {
+            window.clearTimeout(changePageTimeout);
+        }
+        changePageTimeout = window.setTimeout(() => {
+            DataGrid.GoToCurrentPage();
+        }, 2000);
+    });
+}
+
+function addAlertHandlers() {
+    UI.AlertsButton.addEventListener("click", ev => {
+        UI.AlertsFrame.classList.toggle("open");
+    });
+    UI.CloseAlertsButton.addEventListener("click", ev => {
+        UI.AlertsFrame.classList.toggle("open");
+    });
+
+    document.querySelectorAll(".alert-dismiss-button").forEach(element => {
+        element.addEventListener("click", ev => {
+            var alertID = (ev.currentTarget as HTMLButtonElement).getAttribute("alert");
+            var xhr = new XMLHttpRequest();
+            xhr.open("delete", location.origin + "/api/Alerts/Delete/" + alertID);
+            xhr.onload = function () {
+                if (xhr.status == 200) {
+                    document.getElementById(alertID).remove();
+                    var currentCount = Number(UI.AlertsCount.innerText);
+                    currentCount--;
+                    UI.AlertsCount.innerText = String(currentCount);
+                }
+                else {
+                    ShowModal("API Error", "There was an error deleting the alert.");
+                }
+            };
+            xhr.send();
+        })
     });
 }
 
@@ -75,6 +118,78 @@ function arrowUpOrDownOnTextArea(e: KeyboardEvent) {
     }
 }
 
+function clickToggleAllDevices() {
+    document.getElementById("toggleAllDevices").addEventListener("click", function (e) {
+        DataGrid.ToggleSelectAll();
+    })
+}
+
+function clickStartRemoteControlButton() {
+    document.getElementById("startRemoteControlButton").addEventListener("click", function (e) {
+        var selectedDevices = DataGrid.GetSelectedDevices();
+        if (selectedDevices.length == 0) {
+            ShowMessage("You must select a device first.");
+        }
+        else if (selectedDevices.length > 1) {
+            ShowMessage("You must select only one device to control.");
+        }
+        else {
+            WebCommands.find(x => x.Name == "RemoteControl").Execute([]);
+        }
+    })
+}
+
+function consoleTabSelected() {
+    $(UI.ConsoleTab).on("shown.bs.tab", () => {
+        UI.ConsoleAlert.hidden = true;
+        UI.ConsoleAlert.innerText = "0";
+        UI.ConsoleFrame.scrollTop = UI.ConsoleFrame.scrollHeight;
+    });
+}
+
+function deviceGroupSelectChanged() {
+    UI.DeviceGroupSelect.addEventListener("change", (ev) => {
+        DataGrid.GridState.GroupFilter = UI.DeviceGroupSelect.value;
+        if (UI.DeviceGroupSelect.selectedIndex == 0) {
+            DataGrid.GridState.ShowAllGroups = true;
+        }
+        else {
+            DataGrid.GridState.ShowAllGroups = false;
+        }
+        DataGrid.ApplyFilterToAll();
+    });
+}
+
+function hideOfflineDevicesCheckboxChanged() {
+    UI.HideOfflineDevicesCheckbox.addEventListener("change", ev => {
+        DataGrid.GridState.HideOffline = UI.HideOfflineDevicesCheckbox.checked;
+        DataGrid.ApplyFilterToAll();
+    });
+}
+
+function inputOnCommandTextArea() {
+    UI.ConsoleTextArea.addEventListener("input", (e: KeyboardEvent) => {
+        var commandMode = CommandProcessor.GetCommandModeShortcut();
+        if (commandMode) {
+            UI.CommandModeSelect.value = commandMode;
+            UI.ConsoleTextArea.value = "";
+            UI.CommandCompletionDiv.classList.add("hidden");
+        }
+        else {
+            CommandProcessor.EvaluateCurrentCommandText();
+        }
+        UI.ConsoleFrame.scrollTop = UI.ConsoleFrame.scrollHeight;
+    });
+}
+
+function inputOnFilterTextBox() {
+    UI.GridFilter.addEventListener("input", (e) => {
+        var currentText = (e.currentTarget as HTMLInputElement).value.toLowerCase();
+        DataGrid.GridState.SearchFilter = currentText;
+        DataGrid.ApplyFilterToAll();
+    })
+}
+
 function keyDownOnInputTextArea() {
     UI.ConsoleTextArea.addEventListener("keydown", function (e: KeyboardEvent) {
         if (!e.shiftKey) {
@@ -143,94 +258,4 @@ function keyDownOnWindow() {
             UI.ConsoleOutputDiv.innerHTML = "";
         }
     });
-}
-
-function inputOnCommandTextArea() {
-    UI.ConsoleTextArea.addEventListener("input", (e: KeyboardEvent) => {
-        var commandMode = CommandProcessor.GetCommandModeShortcut();
-        if (commandMode) {
-            UI.CommandModeSelect.value = commandMode;
-            UI.ConsoleTextArea.value = "";
-            UI.CommandCompletionDiv.classList.add("hidden");
-        }
-        else {
-            CommandProcessor.EvaluateCurrentCommandText();
-        }
-        UI.ConsoleFrame.scrollTop = UI.ConsoleFrame.scrollHeight;
-    });
-}
-function inputOnFilterTextBox() {
-    UI.GridFilter.addEventListener("input", (e) => {
-        var currentText = (e.currentTarget as HTMLInputElement).value.toLowerCase();
-        DataGrid.FilterOptions.SearchFilter = currentText;
-        DataGrid.ApplyFilter();
-    })
-}
-function consoleTabSelected() {
-    $(UI.ConsoleTab).on("shown.bs.tab", () => {
-        UI.ConsoleAlert.hidden = true;
-        UI.ConsoleAlert.innerText = "0";
-        UI.ConsoleFrame.scrollTop = UI.ConsoleFrame.scrollHeight;
-    });
-}
-function addAlertHandlers() {
-    UI.AlertsButton.addEventListener("click", ev => {
-        UI.AlertsFrame.classList.toggle("open");
-    });
-    UI.CloseAlertsButton.addEventListener("click", ev => {
-        UI.AlertsFrame.classList.toggle("open");
-    });
-
-    document.querySelectorAll(".alert-dismiss-button").forEach(element => {
-        element.addEventListener("click", ev => {
-            var alertID = (ev.currentTarget as HTMLButtonElement).getAttribute("alert");
-            var xhr = new XMLHttpRequest();
-            xhr.open("delete", location.origin + "/api/Alerts/Delete/" + alertID);
-            xhr.onload = function () {
-                if (xhr.status == 200) {
-                    document.getElementById(alertID).remove();
-                    var currentCount = Number(UI.AlertsCount.innerText);
-                    currentCount--;
-                    UI.AlertsCount.innerText = String(currentCount);
-                }
-                else {
-                    ShowModal("API Error", "There was an error deleting the alert.");
-                }
-            };
-            xhr.send();
-        })
-    });
-}
-function clickToggleAllDevices() {
-    document.getElementById("toggleAllDevices").addEventListener("click", function (e) {
-        DataGrid.ToggleSelectAll();
-    })
-}
-
-function clickStartRemoteControlButton() {
-    document.getElementById("startRemoteControlButton").addEventListener("click", function (e) {
-        var selectedDevices = DataGrid.GetSelectedDevices();
-        if (selectedDevices.length == 0) {
-            ShowMessage("You must select a device first.");
-        }
-        else if (selectedDevices.length > 1) {
-            ShowMessage("You must select only one device to control.");
-        }
-        else {
-            WebCommands.find(x => x.Name == "RemoteControl").Execute([]);
-        }
-    })
-}
-
-function deviceGroupSelectChanged() {
-    UI.DeviceGroupSelect.addEventListener("change", (ev) => {
-        DataGrid.FilterOptions.GroupFilter = UI.DeviceGroupSelect.value;
-        if (UI.DeviceGroupSelect.selectedIndex == 0) {
-            DataGrid.FilterOptions.ShowAllGroups = true;
-        }
-        else {
-            DataGrid.FilterOptions.ShowAllGroups = false;
-        }
-        DataGrid.ApplyFilter();
-    });
 }
\ No newline at end of file
diff --git a/Server/wwwroot/scripts/Main/UI.js b/Server/wwwroot/scripts/Main/UI.js
index 7fbba4c38..bd4a0cc2b 100644
--- a/Server/wwwroot/scripts/Main/UI.js
+++ b/Server/wwwroot/scripts/Main/UI.js
@@ -10,15 +10,20 @@ export var ConsoleFrame = document.getElementById("consoleFrame");
 export var ConsoleOutputDiv = document.querySelector("#consoleOutputDiv");
 export var ConsoleTab = document.getElementById("consoleTab");
 export var ConsoleTextArea = document.querySelector("#consoleTextArea");
+export var CurrentPageInput = document.querySelector("#currentPageInput");
 export var DeviceGrid = document.querySelector("#deviceGrid");
+export var DeviceGridBody = document.querySelector("#deviceGrid tbody");
 export var DeviceGroupSelect = document.getElementById("deviceGroupSelect");
 export var DevicesSelectedCount = document.querySelector("#devicesSelectedSpan");
 export var GridFilter = document.getElementById("gridFilter");
 export var HideOfflineDevicesCheckbox = document.querySelector("#hideOfflineDevicesCheckbox");
+export var LeftPaginationButton = document.querySelector("#leftPaginationButton");
 export var MeasurementCanvas = document.createElement("canvas");
 export var MeasurementContext = MeasurementCanvas.getContext("2d");
 export var OnlineDevicesCount = document.querySelector("#onlineDevicesSpan");
+export var RightPaginationButton = document.querySelector("#rightPaginationButton");
 export var TabContentWrapper = document.getElementById("tabContentWrapper");
 export var ToastsWrapper = document.getElementById("toastsWrapper");
 export var TotalDevicesCount = document.querySelector("#totalDevicesSpan");
+export var TotalPagesSpan = document.querySelector("#totalPagesSpan");
 //# sourceMappingURL=UI.js.map
\ No newline at end of file
diff --git a/Server/wwwroot/scripts/Main/UI.js.map b/Server/wwwroot/scripts/Main/UI.js.map
index 47f3cd17e..77ad0a6ba 100644
--- a/Server/wwwroot/scripts/Main/UI.js.map
+++ b/Server/wwwroot/scripts/Main/UI.js.map
@@ -1 +1 @@
-{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAI,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAsB,CAAC;AACvF,MAAM,CAAC,IAAI,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAoB,CAAC;AACnF,MAAM,CAAC,IAAI,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAmB,CAAC;AAClF,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,cAAc,CAAC,wBAAwB,CAAsB,CAAC;AACtG,MAAM,CAAC,IAAI,oBAAoB,GAAG,QAAQ,CAAC,aAAa,CAAC,uBAAuB,CAAmB,CAAC;AACpG,MAAM,CAAC,IAAI,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAmB,CAAC;AACxF,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,aAAa,CAAC,oBAAoB,CAAsB,CAAC;AACjG,MAAM,CAAC,IAAI,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAsB,CAAC;AACvF,MAAM,CAAC,IAAI,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAmB,CAAC;AACpF,MAAM,CAAC,IAAI,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAmB,CAAC;AAC5F,MAAM,CAAC,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAsB,CAAC;AACnF,MAAM,CAAC,IAAI,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,kBAAkB,CAAwB,CAAC;AAC/F,MAAM,CAAC,IAAI,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAqB,CAAC;AAClF,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,cAAc,CAAC,mBAAmB,CAAsB,CAAC;AACjG,MAAM,CAAC,IAAI,oBAAoB,GAAG,QAAQ,CAAC,aAAa,CAAC,sBAAsB,CAAoB,CAAC;AACpG,MAAM,CAAC,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAqB,CAAC;AAClF,MAAM,CAAC,IAAI,0BAA0B,GAAG,QAAQ,CAAC,aAAa,CAAC,6BAA6B,CAAqB,CAAC;AAClH,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;AAChE,MAAM,CAAC,IAAI,kBAAkB,GAAG,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AACnE,MAAM,CAAC,IAAI,kBAAkB,GAAG,QAAQ,CAAC,aAAa,CAAC,oBAAoB,CAAoB,CAAC;AAChG,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,cAAc,CAAC,mBAAmB,CAAmB,CAAC;AAC9F,MAAM,CAAC,IAAI,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAmB,CAAC;AACtF,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAoB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAI,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAsB,CAAC;AACvF,MAAM,CAAC,IAAI,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAoB,CAAC;AACnF,MAAM,CAAC,IAAI,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAmB,CAAC;AAClF,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,cAAc,CAAC,wBAAwB,CAAsB,CAAC;AACtG,MAAM,CAAC,IAAI,oBAAoB,GAAG,QAAQ,CAAC,aAAa,CAAC,uBAAuB,CAAmB,CAAC;AACpG,MAAM,CAAC,IAAI,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAmB,CAAC;AACxF,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,aAAa,CAAC,oBAAoB,CAAsB,CAAC;AACjG,MAAM,CAAC,IAAI,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAsB,CAAC;AACvF,MAAM,CAAC,IAAI,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAmB,CAAC;AACpF,MAAM,CAAC,IAAI,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAmB,CAAC;AAC5F,MAAM,CAAC,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAsB,CAAC;AACnF,MAAM,CAAC,IAAI,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,kBAAkB,CAAwB,CAAC;AAC/F,MAAM,CAAC,IAAI,gBAAgB,GAAG,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAqB,CAAC;AAC9F,MAAM,CAAC,IAAI,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAqB,CAAC;AAClF,MAAM,CAAC,IAAI,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAoB,CAAC;AAC3F,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,cAAc,CAAC,mBAAmB,CAAsB,CAAC;AACjG,MAAM,CAAC,IAAI,oBAAoB,GAAG,QAAQ,CAAC,aAAa,CAAC,sBAAsB,CAAoB,CAAC;AACpG,MAAM,CAAC,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAqB,CAAC;AAClF,MAAM,CAAC,IAAI,0BAA0B,GAAG,QAAQ,CAAC,aAAa,CAAC,6BAA6B,CAAqB,CAAC;AAClH,MAAM,CAAC,IAAI,oBAAoB,GAAG,QAAQ,CAAC,aAAa,CAAC,uBAAuB,CAAsB,CAAC;AACvG,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;AAChE,MAAM,CAAC,IAAI,kBAAkB,GAAG,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AACnE,MAAM,CAAC,IAAI,kBAAkB,GAAG,QAAQ,CAAC,aAAa,CAAC,oBAAoB,CAAoB,CAAC;AAChG,MAAM,CAAC,IAAI,qBAAqB,GAAG,QAAQ,CAAC,aAAa,CAAC,wBAAwB,CAAsB,CAAC;AACzG,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,cAAc,CAAC,mBAAmB,CAAmB,CAAC;AAC9F,MAAM,CAAC,IAAI,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAmB,CAAC;AACtF,MAAM,CAAC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAoB,CAAC;AAC9F,MAAM,CAAC,IAAI,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAoB,CAAC"}
\ No newline at end of file
diff --git a/Server/wwwroot/scripts/Main/UI.ts b/Server/wwwroot/scripts/Main/UI.ts
index b51bc2220..7e9a4ab7e 100644
--- a/Server/wwwroot/scripts/Main/UI.ts
+++ b/Server/wwwroot/scripts/Main/UI.ts
@@ -10,14 +10,19 @@ export var ConsoleFrame = document.getElementById("consoleFrame") as HTMLDivElem
 export var ConsoleOutputDiv = document.querySelector("#consoleOutputDiv") as HTMLDivElement;
 export var ConsoleTab = document.getElementById("consoleTab") as HTMLAnchorElement;
 export var ConsoleTextArea = document.querySelector("#consoleTextArea") as HTMLTextAreaElement;
+export var CurrentPageInput = document.querySelector("#currentPageInput") as HTMLInputElement;
 export var DeviceGrid = document.querySelector("#deviceGrid") as HTMLTableElement;
+export var DeviceGridBody = document.querySelector("#deviceGrid tbody") as HTMLBodyElement;
 export var DeviceGroupSelect = document.getElementById("deviceGroupSelect") as HTMLSelectElement;
 export var DevicesSelectedCount = document.querySelector("#devicesSelectedSpan") as HTMLSpanElement;
 export var GridFilter = document.getElementById("gridFilter") as HTMLInputElement;
 export var HideOfflineDevicesCheckbox = document.querySelector("#hideOfflineDevicesCheckbox") as HTMLInputElement;
+export var LeftPaginationButton = document.querySelector("#leftPaginationButton") as HTMLButtonElement;
 export var MeasurementCanvas = document.createElement("canvas");
 export var MeasurementContext = MeasurementCanvas.getContext("2d");
 export var OnlineDevicesCount = document.querySelector("#onlineDevicesSpan") as HTMLSpanElement;
+export var RightPaginationButton = document.querySelector("#rightPaginationButton") as HTMLButtonElement;
 export var TabContentWrapper = document.getElementById("tabContentWrapper") as HTMLDivElement;
 export var ToastsWrapper = document.getElementById("toastsWrapper") as HTMLDivElement;
-export var TotalDevicesCount = document.querySelector("#totalDevicesSpan") as HTMLSpanElement;
\ No newline at end of file
+export var TotalDevicesCount = document.querySelector("#totalDevicesSpan") as HTMLSpanElement;
+export var TotalPagesSpan = document.querySelector("#totalPagesSpan") as HTMLSpanElement;
\ No newline at end of file