diff --git a/Server/API/AlertsController.cs b/Server/API/AlertsController.cs
index d25610846..92cd36397 100644
--- a/Server/API/AlertsController.cs
+++ b/Server/API/AlertsController.cs
@@ -29,7 +29,6 @@ public AlertsController(DataService dataService, IEmailSenderEx emailSender)
         private IEmailSenderEx EmailSender { get; }
 
         [HttpPost("Create")]
-        [ServiceFilter(typeof(ApiAuthorizationFilter))]
         public async Task<IActionResult> Create(AlertOptions alertOptions)
         {
             Request.Headers.TryGetValue("OrganizationID", out var orgID);
@@ -94,7 +93,6 @@ await EmailSender.SendEmailAsync(alertOptions.EmailTo,
         }
 
         [HttpPost("Delete/{alertID}")]
-        [ServiceFilter(typeof(ApiAuthorizationFilter))]
         public async Task<IActionResult> Delete(string alertID)
         {
             Request.Headers.TryGetValue("OrganizationID", out var orgID);
diff --git a/Server/Auth/ApiAuthorizationFilter.cs b/Server/Auth/ApiAuthorizationFilter.cs
index 126bd99f0..dd861b6c7 100644
--- a/Server/Auth/ApiAuthorizationFilter.cs
+++ b/Server/Auth/ApiAuthorizationFilter.cs
@@ -35,6 +35,12 @@ public void OnAuthorization(AuthorizationFilterContext context)
                 if (DataService.ValidateApiToken(apiToken, apiSecret, context.HttpContext.Request.Path, context.HttpContext.Connection.RemoteIpAddress.ToString()))
                 {
                     var orgID = DataService.GetApiToken(apiToken)?.OrganizationID;
+
+                    // In case the filter gets run twice.
+                    if (context.HttpContext.Request.Headers.ContainsKey("OrganizationID"))
+                    {
+                        return;
+                    }
                     context.HttpContext.Request.Headers.Add("OrganizationID", orgID);
                     return;
                 }
diff --git a/Server/Pages/EditDevice.cshtml b/Server/Pages/EditDevice.cshtml
index 57c5d6bbd..8a7aa795f 100644
--- a/Server/Pages/EditDevice.cshtml
+++ b/Server/Pages/EditDevice.cshtml
@@ -28,6 +28,12 @@ else
                     <input type="text" class="form-control" name="device-name" readonly value="@Model.DeviceName" />
                 </div>
             </div>
+            <div class="form-group row">
+                <label for="device-name" class="col-sm-2 col-form-label">Device:</label>
+                <div class="col-sm-10">
+                    <input type="text" class="form-control" name="device-name" readonly value="@Model.DeviceID" />
+                </div>
+            </div>
             <div class="form-group row">
                 <label for="agent-version" class="col-sm-2 col-form-label">Agent Version:</label>
                 <div class="col-sm-10">
diff --git a/Server/Pages/EditDevice.cshtml.cs b/Server/Pages/EditDevice.cshtml.cs
index 24a1aec3e..28ae8ddbc 100644
--- a/Server/Pages/EditDevice.cshtml.cs
+++ b/Server/Pages/EditDevice.cshtml.cs
@@ -22,6 +22,7 @@ public EditDeviceModel(DataService dataService)
         public string AgentVersion { get; set; }
         public List<SelectListItem> DeviceGroups { get; } = new List<SelectListItem>();
         public string DeviceName { get; set; }
+        public string DeviceID { get; set; }
 
         [BindProperty]
         public InputModel Input { get; set; } = new InputModel();
@@ -68,6 +69,7 @@ private void PopulateViewModel(string deviceID)
             {
                 var device = DataService.GetDevice(user.OrganizationID, deviceID);
                 DeviceName = device?.DeviceName;
+                DeviceID = device?.ID;
                 AgentVersion = device.AgentVersion;
                 Input.Alias = device?.Alias;
                 Input.DeviceGroupID = device?.DeviceGroupID;
diff --git a/Server/Pages/Index.cshtml.cs b/Server/Pages/Index.cshtml.cs
index c74708fce..d1a9c7a47 100644
--- a/Server/Pages/Index.cshtml.cs
+++ b/Server/Pages/Index.cshtml.cs
@@ -24,10 +24,10 @@ public IndexModel(DataService dataService,
 
         public string DefaultPrompt { get; set; }
         public List<SelectListItem> DeviceGroups { get; set; } = new List<SelectListItem>();
+        public List<Alert> Alerts { get; set; } = new List<Alert>();
+        private ApplicationConfig AppConfig { get; }
         private DataService DataService { get; }
         private SignInManager<RemotelyUser> SignInManager { get; }
-        private ApplicationConfig AppConfig { get; }
-
         public async Task<IActionResult> OnGet()
         {
             if (User?.Identity?.IsAuthenticated == true)
@@ -50,6 +50,12 @@ public async Task<IActionResult> OnGet()
                 {
                     DeviceGroups.AddRange(groups.Select(x => new SelectListItem(x.Name, x.ID)));
                 }
+                var alerts = DataService.GetAlerts(user.Id);
+                if (alerts.Any())
+                {
+                    Alerts.AddRange(alerts);
+                }
+
             }
             else
             {
diff --git a/Server/Pages/_IndexLoggedIn.cshtml b/Server/Pages/_IndexLoggedIn.cshtml
index 5e833a9c7..f97370c02 100644
--- a/Server/Pages/_IndexLoggedIn.cshtml
+++ b/Server/Pages/_IndexLoggedIn.cshtml
@@ -1,5 +1,34 @@
 @model IndexModel
 
+
+<button id="alertsButton" class="btn btn-info">
+    <span class="fa fa-bell"></span>
+    @Model.Alerts.Count
+</button>
+
+<div id="alertsFrame" class="bg-secondary">
+    <div class="text-right">
+        <span id="closeAlertsFrameButton" class="fa fa-times pointer mt-2 mr-2"></span>
+    </div>
+    
+    <div class="mt-3">
+        @foreach (var alert in Model.Alerts)
+        {
+            <div class="card border-primary mb-3">
+                <div class="card-header">@alert.CreatedOn.ToString()</div>
+                <div class="card-body">
+                    @if (!string.IsNullOrWhiteSpace(alert.Device?.DeviceName))
+                    {
+                        <h6 class="card-title">@alert.Device.DeviceName</h6>
+                    }
+                    <p class="card-text">@alert.Message</p>
+                </div>
+            </div>
+        }
+    </div>
+
+</div>
+
 <div class="work-area hidden">
     <ul class="nav nav-tabs">
         <li class="nav-item">
@@ -24,8 +53,6 @@
             <partial name="_ConsoleFrame" model="Model" />
         </div>
     </div>
-
-
 </div>
 
 <script src="~/scripts/Main.js" type="module"></script>
diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
index c4b6eca61..03fda1621 100644
--- a/Server/Services/DataService.cs
+++ b/Server/Services/DataService.cs
@@ -36,20 +36,27 @@ public DataService(ApplicationDbContext context,
 
         public async Task AddAlert(AlertOptions alertOptions, string organizationID)
         {
-            await RemotelyContext.Users
+            var users = RemotelyContext.Users
                 .Include(x => x.Alerts)
-                .Where(x => x.OrganizationID == organizationID)
-                .ForEachAsync(x => {
-                    var alert = new Alert()
-                    {
-                        CreatedOn = DateTimeOffset.Now,
-                        DeviceID = alertOptions.AlertDeviceID,
-                        Message = alertOptions.AlertMessage,
-                        OrganizationID = organizationID
-                    };
-                    x.Alerts.Add(alert);
-                });
+                .Where(x => x.OrganizationID == organizationID);
+
+            if (!string.IsNullOrWhiteSpace(alertOptions.AlertDeviceID))
+            {
+                var filteredUserIDs = FilterUsersByDevicePermission(users.Select(x => x.Id), alertOptions.AlertDeviceID);
+                users = users.Where(x => filteredUserIDs.Contains(x.Id));
+            }
 
+            await users.ForEachAsync(x => {
+                var alert = new Alert()
+                {
+                    CreatedOn = DateTimeOffset.Now,
+                    DeviceID = alertOptions.AlertDeviceID,
+                    Message = alertOptions.AlertMessage,
+                    OrganizationID = organizationID
+                };
+                x.Alerts.Add(alert);
+            });
+            
             await RemotelyContext.SaveChangesAsync();
         }
 
@@ -83,11 +90,6 @@ public bool AddDeviceGroup(string orgID, DeviceGroup deviceGroup, out string dev
             return true;
         }
 
-        public async Task<Alert> GetAlert(string alertID)
-        {
-            return await RemotelyContext.Alerts.FirstOrDefaultAsync(x => x.ID == alertID);
-        }
-
         public InviteLink AddInvite(string orgID, Invite invite)
         {
             invite.InvitedUser = invite.InvitedUser.ToLower();
@@ -485,6 +487,21 @@ public string[] FilterUsersByDevicePermission(IEnumerable<string> userIDs, strin
                 .ToArray();
         }
 
+        public async Task<Alert> GetAlert(string alertID)
+        {
+            return await RemotelyContext.Alerts
+                .Include(x => x.Device)
+                .Include(x => x.User)
+                .FirstOrDefaultAsync(x => x.ID == alertID);
+        }
+
+        public IEnumerable<Alert> GetAlerts(string userID)
+        {
+            return RemotelyContext.Alerts
+                .Include(x => x.Device)
+                .Include(x => x.User)
+                .Where(x => x.UserID == userID);
+        }
         public IEnumerable<ApiToken> GetAllApiTokens(string userID)
         {
             var user = RemotelyContext.Users.FirstOrDefault(x => x.Id == userID);
diff --git a/Server/wwwroot/css/Themes/cyborg.custom.css b/Server/wwwroot/css/Themes/cyborg.custom.css
index b7a987d7d..8cdec1b74 100644
--- a/Server/wwwroot/css/Themes/cyborg.custom.css
+++ b/Server/wwwroot/css/Themes/cyborg.custom.css
@@ -112,7 +112,7 @@ button.navbar-toggler:hover {
     color: limegreen;
 }
 
-.fa-times {
+td .fa-times {
     color: red;
 }
 
diff --git a/Server/wwwroot/css/Themes/yeti.custom.css b/Server/wwwroot/css/Themes/yeti.custom.css
index 87b3d4270..a14d372d7 100644
--- a/Server/wwwroot/css/Themes/yeti.custom.css
+++ b/Server/wwwroot/css/Themes/yeti.custom.css
@@ -107,7 +107,7 @@ button.navbar-toggler:hover {
     color: forestgreen;
 }
 
-.fa-times {
+td .fa-times {
     color: red;
 }
 
diff --git a/Server/wwwroot/css/site.css b/Server/wwwroot/css/site.css
index 63fdc32bd..f617b4f02 100644
--- a/Server/wwwroot/css/site.css
+++ b/Server/wwwroot/css/site.css
@@ -236,6 +236,39 @@ span.label.code {
     margin-bottom: -5px;
 }
 
+
+#alertsButton {
+    position: absolute;
+    top: 75px;
+    right: 5px;
+    z-index: 2;
+    transition: .5s ease left;
+    user-select: none;
+}
+
+
+#alertsFrame {
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 100%;
+    width: 0;
+    overflow-x: hidden;
+    overflow-y: auto;
+    text-align: center;
+    opacity: 0;
+    z-index: 2;
+    transition: .5s ease all;
+}
+
+#alertsFrame.open {
+    width: 350px;
+    opacity: 1;
+    transition: .5s ease all;
+}
+
+
+
 .float-message {
     position: fixed;
     top: 20px;
diff --git a/Server/wwwroot/scripts/InputEventHandlers.js b/Server/wwwroot/scripts/InputEventHandlers.js
index b0dc95282..ff27e8ec2 100644
--- a/Server/wwwroot/scripts/InputEventHandlers.js
+++ b/Server/wwwroot/scripts/InputEventHandlers.js
@@ -15,6 +15,7 @@ export function ApplyInputEventHandlers() {
     clickStartRemoteControlButton();
     consoleTabSelected();
     deviceGroupSelectChanged();
+    clickAlertsButtons();
     window.addEventListener("resize", ev => {
         PositionCommandCompletionWindow();
     });
@@ -156,6 +157,14 @@ function consoleTabSelected() {
         UI.ConsoleFrame.scrollTop = UI.ConsoleFrame.scrollHeight;
     });
 }
+function clickAlertsButtons() {
+    UI.AlertsButton.addEventListener("click", ev => {
+        UI.AlertsFrame.classList.toggle("open");
+    });
+    UI.CloseAlertsButton.addEventListener("click", ev => {
+        UI.AlertsFrame.classList.toggle("open");
+    });
+}
 function clickToggleAllDevices() {
     document.getElementById("toggleAllDevices").addEventListener("click", function (e) {
         DataGrid.ToggleSelectAll();
diff --git a/Server/wwwroot/scripts/InputEventHandlers.js.map b/Server/wwwroot/scripts/InputEventHandlers.js.map
index 47457bbfd..5ee14ceb4 100644
--- a/Server/wwwroot/scripts/InputEventHandlers.js.map
+++ b/Server/wwwroot/scripts/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":"AAAA,OAAO,EAAE,+BAA+B,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,MAAM,UAAU,uBAAuB;IACnC,eAAe,EAAE,CAAC;IAClB,sBAAsB,EAAE,CAAC;IACzB,sBAAsB,EAAE,CAAC;IACzB,oBAAoB,EAAE,CAAC;IACvB,qBAAqB,EAAE,CAAC;IACxB,6BAA6B,EAAE,CAAC;IAChC,kBAAkB,EAAE,CAAC;IACrB,wBAAwB,EAAE,CAAC;IAC3B,kBAAkB,EAAE,CAAC;IAErB,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE;QACnC,+BAA+B,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,uBAAuB,CAAC,CAAgB;IAC7C,IAAI,CAAC,CAAC,OAAO,EAAE;QACX,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,WAAW,EAAE;YACpC,EAAE,CAAC,iBAAiB,CAAC,SAAS,IAAI,EAAE,CAAC;SACxC;aACI,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,SAAS,EAAE;YACvC,EAAE,CAAC,iBAAiB,CAAC,SAAS,IAAI,EAAE,CAAC;SACxC;KACJ;SACI;QACD,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;YACvD,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,WAAW,EAAE;gBACpC,IAAI,KAAK,CAAC,yBAAyB,GAAG,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/E,KAAK,CAAC,yBAAyB,IAAI,CAAC,CAAC;oBACrC,6BAA6B,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;oBAC9D,EAAE,CAAC,oBAAoB,CAAC,aAAa,CAAC,WAAW,CAAiB,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;iBACnG;aACJ;iBACI,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,SAAS,EAAE;gBACvC,IAAI,KAAK,CAAC,yBAAyB,GAAG,CAAC,EAAE;oBACrC,KAAK,CAAC,yBAAyB,IAAI,CAAC,CAAC;oBACrC,6BAA6B,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;oBAC9D,EAAE,CAAC,oBAAoB,CAAC,aAAa,CAAC,WAAW,CAAiB,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;iBACnG;aACJ;SACJ;aACI;YACD,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,WAAW,EAAE;gBACpC,IAAI,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjE,KAAK,CAAC,oBAAoB,IAAI,CAAC,CAAC;oBAChC,EAAE,CAAC,eAAe,CAAC,KAAK,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;iBAClF;aACJ;iBACI,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,SAAS,EAAE;gBACvC,IAAI,KAAK,CAAC,oBAAoB,GAAG,CAAC,EAAE;oBAChC,KAAK,CAAC,oBAAoB,IAAI,CAAC,CAAC;oBAChC,EAAE,CAAC,eAAe,CAAC,KAAK,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;iBAClF;aACJ;SACJ;KACJ;AACL,CAAC;AAED,SAAS,sBAAsB;IAC3B,EAAE,CAAC,eAAe,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,CAAgB;QACrE,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE;YACb,QAAQ,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE;gBACzB,KAAK,OAAO;oBACR,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,IAAI,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE;wBAC7C,OAAO;qBACV;oBACD,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAChD,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAC1C,gBAAgB,CAAC,4BAA4B,EAAE,CAAC,eAAe,CAAC,KAAK,SAAS,CAAC,CAAC;oBAChF,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE;wBAC3B,gBAAgB,CAAC,iCAAiC,CAAC,CAAC;wBACpD,cAAc,CAAC,OAAO,EAAE,CAAC;wBACzB,OAAO;qBACV;oBACD,gBAAgB,CAAC,cAAc,EAAE,CAAC;oBAClC,MAAM;gBACV,KAAK,SAAS,CAAC;gBACf,KAAK,WAAW;oBACZ,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,uBAAuB,CAAC,CAAC,CAAC,CAAC;oBAC3B,MAAM;gBACV,KAAK,QAAQ;oBACT,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wBACvD,CAAC,CAAC,cAAc,EAAE,CAAC;wBACnB,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAChD,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;qBAC7C;yBACI;wBACD,CAAC,CAAC,cAAc,EAAE,CAAC;wBACnB,EAAE,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC;qBACjC;oBACD,MAAM;gBACV,KAAK,KAAK;oBACN,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wBACvD,CAAC,CAAC,cAAc,EAAE,CAAC;wBAClB,EAAE,CAAC,oBAAoB,CAAC,aAAa,CAAC,WAAW,CAAiB,CAAC,KAAK,EAAE,CAAC;qBAC/E;oBACD,MAAM;gBACV,KAAK,WAAW;oBACZ,IAAI,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wBAC/F,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAChD,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;qBAC7C;oBACD,MAAM;gBACV;oBACI,MAAM;aACb;SACJ;IACL,CAAC,CAAC,CAAA;AACN,CAAC;AAED,SAAS,eAAe;IACpB,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAgB,EAAE,EAAE;QACpD,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,eAAe,CAAC;YACvD,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,QAAQ;YACxD,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,OAAO;YACvD,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,UAAU;YAC1D,CAAC,CAAC,CAAC,MAAM;YACT,CAAC,CAAC,CAAC,OAAO,EAAE;YACZ,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;SAC9B;QACD,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,GAAG,EAAE;YACzC,EAAE,CAAC,gBAAgB,CAAC,SAAS,GAAG,EAAE,CAAC;SACtC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,sBAAsB;IAC3B,EAAE,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAgB,EAAE,EAAE;QAC9D,IAAI,WAAW,GAAG,gBAAgB,CAAC,sBAAsB,EAAE,CAAC;QAC5D,IAAI,WAAW,EAAE;YACb,EAAE,CAAC,iBAAiB,CAAC,KAAK,GAAG,WAAW,CAAC;YACzC,EAAE,CAAC,eAAe,CAAC,KAAK,GAAG,EAAE,CAAC;YAC9B,EAAE,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SACnD;aACI;YACD,gBAAgB,CAAC,0BAA0B,EAAE,CAAC;SACjD;QACD,EAAE,CAAC,YAAY,CAAC,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC;IAC7D,CAAC,CAAC,CAAC;AACP,CAAC;AACD,SAAS,oBAAoB;IACzB,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;QAC1C,IAAI,WAAW,GAAI,CAAC,CAAC,aAAkC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAC5E,QAAQ,CAAC,aAAa,CAAC,YAAY,GAAG,WAAW,CAAC;QAClD,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAA;AACN,CAAC;AACD,SAAS,kBAAkB;IACvB,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC;QAC9B,EAAE,CAAC,YAAY,CAAC,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC;IAC7D,CAAC,CAAC,CAAC;AACP,CAAC;AACD,SAAS,kBAAkB;IACvB,EAAE,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE;QAC3C,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE;QAChD,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACP,CAAC;AACD,SAAS,qBAAqB;IAC1B,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC;QAC7E,QAAQ,CAAC,eAAe,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAA;AACN,CAAC;AAED,SAAS,6BAA6B;IAClC,QAAQ,CAAC,cAAc,CAAC,0BAA0B,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC;QACrF,IAAI,eAAe,GAAG,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QACpD,IAAI,eAAe,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7B,EAAE,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;SACtD;aACI,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YACjC,EAAE,CAAC,YAAY,CAAC,6CAA6C,CAAC,CAAC;SAClE;aACI;YACD,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAChE;IACL,CAAC,CAAC,CAAA;AACN,CAAC;AAED,SAAS,wBAAwB;IAC7B,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE;QACnD,QAAQ,CAAC,aAAa,CAAC,WAAW,GAAG,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC;QAChE,IAAI,EAAE,CAAC,iBAAiB,CAAC,aAAa,IAAI,CAAC,EAAE;YACzC,QAAQ,CAAC,aAAa,CAAC,aAAa,GAAG,IAAI,CAAC;SAC/C;aACI;YACD,QAAQ,CAAC,aAAa,CAAC,aAAa,GAAG,KAAK,CAAC;SAChD;QACD,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC"}
\ No newline at end of file
diff --git a/Server/wwwroot/scripts/InputEventHandlers.ts b/Server/wwwroot/scripts/InputEventHandlers.ts
index 2b397b90b..c41c43d1f 100644
--- a/Server/wwwroot/scripts/InputEventHandlers.ts
+++ b/Server/wwwroot/scripts/InputEventHandlers.ts
@@ -17,6 +17,7 @@ export function ApplyInputEventHandlers() {
     clickStartRemoteControlButton();
     consoleTabSelected();
     deviceGroupSelectChanged();
+    clickAlertsButtons();
 
     window.addEventListener("resize", ev => {
         PositionCommandCompletionWindow();
@@ -163,6 +164,14 @@ function consoleTabSelected() {
         UI.ConsoleFrame.scrollTop = UI.ConsoleFrame.scrollHeight;
     });
 }
+function clickAlertsButtons() {
+    UI.AlertsButton.addEventListener("click", ev => {
+        UI.AlertsFrame.classList.toggle("open");
+    });
+    UI.CloseAlertsButton.addEventListener("click", ev => {
+        UI.AlertsFrame.classList.toggle("open");
+    });
+}
 function clickToggleAllDevices() {
     document.getElementById("toggleAllDevices").addEventListener("click", function (e) {
         DataGrid.ToggleSelectAll();
diff --git a/Server/wwwroot/scripts/UI.js b/Server/wwwroot/scripts/UI.js
index 07ec0e4a9..7c486c951 100644
--- a/Server/wwwroot/scripts/UI.js
+++ b/Server/wwwroot/scripts/UI.js
@@ -16,6 +16,9 @@ export var ConsoleTab = document.getElementById("consoleTab");
 export var ConsoleAlert = document.getElementById("consoleAlert");
 export var DeviceGroupSelect = document.getElementById("deviceGroupSelect");
 export var GridFilter = document.getElementById("gridFilter");
+export var AlertsButton = document.getElementById("alertsButton");
+export var CloseAlertsButton = document.getElementById("closeAlertsFrameButton");
+export var AlertsFrame = document.getElementById("alertsFrame");
 export function PopupMessage(message) {
     var messageDiv = document.createElement("div");
     messageDiv.classList.add("float-message");
diff --git a/Server/wwwroot/scripts/UI.js.map b/Server/wwwroot/scripts/UI.js.map
index 9621c61b3..e50938638 100644
--- a/Server/wwwroot/scripts/UI.js.map
+++ b/Server/wwwroot/scripts/UI.js.map
@@ -1 +1 @@
-{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"UI.js","sourceRoot":"","sources":["UI.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/Server/wwwroot/scripts/UI.ts b/Server/wwwroot/scripts/UI.ts
index 598c4b90f..4659ef716 100644
--- a/Server/wwwroot/scripts/UI.ts
+++ b/Server/wwwroot/scripts/UI.ts
@@ -18,6 +18,9 @@ export var ConsoleTab = document.getElementById("consoleTab") as HTMLAnchorEleme
 export var ConsoleAlert = document.getElementById("consoleAlert") as HTMLAnchorElement;
 export var DeviceGroupSelect = document.getElementById("deviceGroupSelect") as HTMLSelectElement;
 export var GridFilter = document.getElementById("gridFilter") as HTMLInputElement;
+export var AlertsButton = document.getElementById("alertsButton") as HTMLButtonElement;
+export var CloseAlertsButton = document.getElementById("closeAlertsFrameButton") as HTMLButtonElement;
+export var AlertsFrame = document.getElementById("alertsFrame") as HTMLDivElement;
 
 
 export function PopupMessage(message: string) {
diff --git a/Tests/DataServiceTests.cs b/Tests/DataServiceTests.cs
index 46fff2f8c..b88d46893 100644
--- a/Tests/DataServiceTests.cs
+++ b/Tests/DataServiceTests.cs
@@ -163,6 +163,12 @@ public async Task AddAlert()
                 ShouldAlert = true
             };
             await DataService.AddAlert(options, TestData.OrganizationID);
+
+            var alerts = DataService.GetAlerts(TestData.Admin1.Id);
+
+            var json = System.Text.Json.JsonSerializer.Serialize(options);
+
+            Assert.AreEqual("Test Message", alerts.First().Message);
         }
     }
 }