diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..24d99f9
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,21 @@
+## Change log
+
+2025-01-19: v2.5.4 - Better handling of the health status window.
+
+2025-01-15: v2.5.3 - Actively update health status window if it is presented.
+
+2025-12-24: v2.5.1 - Log health status rates below 1.0.
+
+2025-12-21: v2.5.0 - Add basic hardware, OS, and jamfStatus app usage collection. Data is sent anonymously to [TelemetryDeck](https://telemetrydeck.com) to aid in the development of the app. View 'About...' to opt out of sending the data. Add ability to view health-status for Jamf Cloud hosted instances. Fix an issue with token renewal.
+
+2023-12-06: v2.4.1 - Minor updates to the alerts display.
+
+2023-11-11: v2.4.0 - Fix issue with notifications not being displayed.  Add ability to use API client.
+
+2023-04-07: v2.3.6 - Update logging to prevent potential looping.  
+
+2022-10-02: v2.3.2 - Rework authentication/token refresh.
+
+2022-06-12: v2.3.1 - Clean up notificatations not displaying properly.
+
+2021-10-15: v2.3.0 - Updated notifications display.
diff --git a/README.md b/README.md
index f569ce3..200966a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
 # jamfStatus
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/jamf/jamfStatus?display_name=tag) ![GitHub all releases](https://img.shields.io/github/downloads/jamf/jamfStatus/total) ![GitHub latest release](https://img.shields.io/github/downloads/jamf/jamfStatus/latest/total)
+ ![GitHub issues](https://img.shields.io/github/issues-raw/jamf/jamfStatus) ![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/jamf/jamfStatus) ![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/jamf/jamfStatus) ![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed-raw/jamf/jamfStatus)
+ 
 Download: [jamfStatus](https://github.com/jamf/jamfStatus/releases/latest/download/jamfStatus.zip)
 
-The application submits basic hardware, OS, and jamfStatus application usage to [TelemetryDeck](https://telemetrydeck.com) by default. The data is sent anonymously and can be disabled by clicking 'Opt out of analytics' from the About window.
+The application submits basic hardware, OS, and jamfStatus application usage to [TelemetryDeck](https://telemetrydeck.com) by default. The data is sent anonymously and can be disabled by clicking 'Opt out of analytics' from the 'About...' window.
 
 Keep an eye on the status of Jamf Cloud with jamfStatus.  The app will place an icon in the menu bar to reflect the current cloud status.
 
@@ -123,20 +126,3 @@ Thu Sep 17 20:27:30 Jamf Cloud: All systems go.
 * Major Update for Jamf Connect Now Available (Jamf Connect <latestVersion>)
 * Device Compliance Connection Interrupted
 * Conditional Access Connection Interrupted
-
-
-## Change log
-
-2025-12-21: v2.5.0 - Add basic hardware, OS, and jamfStatus app usage collection. Data is sent anonymously to [TelemetryDeck](https:telemetrydeck.com) to aid in the development of the app. View 'About...' to opt out of sending the data. Add ability to view health-status for Jamf Cloud hosted instances. Fix an issue with token renewal.
-
-2023-12-06: v2.4.1 - Minor updates to the alerts display.
-
-2023-11-11: v2.4.0 - Fix issue with notifications not being displayed.  Add ability to use API client.
-
-2023-04-07: v2.3.6 - Update logging to prevent potential looping.  
-
-2022-10-02: v2.3.2 - Rework authentication/token refresh.
-
-2022-06-12: v2.3.1 - Clean up notificatations not displaying properly.
-
-2021-10-15: v2.3.0 - Updated notifications display.
diff --git a/jamfStatus.xcodeproj/project.pbxproj b/jamfStatus.xcodeproj/project.pbxproj
index 675f60a..86fd781 100644
--- a/jamfStatus.xcodeproj/project.pbxproj
+++ b/jamfStatus.xcodeproj/project.pbxproj
@@ -406,7 +406,7 @@
 					"$(SDKROOT)/usr/lib/system/introspection",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 2.5.0;
+				MARKETING_VERSION = 2.5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jamf.pse.jamfStatus;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -441,7 +441,7 @@
 					"$(SDKROOT)/usr/lib/system/introspection",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 2.5.0;
+				MARKETING_VERSION = 2.5.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jamf.pse.jamfStatus;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/jamfStatus/AppDelegate.swift b/jamfStatus/AppDelegate.swift
index 84b5a80..017e123 100644
--- a/jamfStatus/AppDelegate.swift
+++ b/jamfStatus/AppDelegate.swift
@@ -9,8 +9,15 @@ import WebKit
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate, URLSessionDelegate {
     
+    func applicationDidFinishLaunching(_ notification: Notification) {
+        NotificationCenter.default.addObserver(self, selector: #selector(updateHealthStatusView(_:)), name: .updateHealthStatusView, object: nil)
+    }
+    
     @IBOutlet weak var cloudStatus_Toolbar: NSToolbar!
     @IBOutlet weak var cloudStatusWindow: NSWindow!
+    @IBOutlet weak var healthStatus_Window: NSWindow!
+    
+    @IBOutlet weak var showHealthStatus_MenuItem: NSMenuItem!
     
     @IBOutlet var page_WebView: WKWebView!
     @IBOutlet weak var prefs_Window: NSWindow!
@@ -50,10 +57,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, URLSessionDelegate {
         TelemetryDeckConfig.OptOut = (sender.state == .on)
     }
     
-    
-    
-    @IBOutlet weak var healthStatus_Window: NSWindow!
-    
     let prefs = Preferences.self
     
     let fm = FileManager()
@@ -170,17 +173,31 @@ class AppDelegate: NSObject, NSApplicationDelegate, URLSessionDelegate {
         }
     }
     
-    @IBAction func credentials_Action(_ sender: Any) {
-        JamfProServer.url = jamfServerUrl_TextField.stringValue
-        
-        let urlRegex = try! NSRegularExpression(pattern: "/?failover(.*?)", options:.caseInsensitive)
-        JamfProServer.url = urlRegex.stringByReplacingMatches(in: JamfProServer.url, options: [], range: NSRange(0..<JamfProServer.url.utf16.count), withTemplate: "")
-        
-        defaults.set(JamfProServer.url, forKey: "jamfServerUrl")
-//        defaults.synchronize()
+    @IBAction func credentials_Action(_ sender: NSTextField) {
         
-        JamfProServer.username = username_TextField.stringValue
-        JamfProServer.password = password_TextField.stringValue
+        switch sender.identifier?.rawValue {
+        case "jamfProURL":
+            JamfProServer.url = jamfServerUrl_TextField.stringValue
+            if jamfServerUrl_TextField.stringValue.baseUrl.isEmpty {
+                DispatchQueue.main.async { [self] in
+                    jamfServerUrl_TextField.becomeFirstResponder()
+                    alert_dialog(header: "", message: "Invlid URL\nMust be in the format: https://server.example.com", updateAvail: false)
+                    if siteConnectionStatus_ImageView.image != statusImage[0] {
+                        siteConnectionStatus_ImageView.image = statusImage[0]
+                    }
+                    return
+                }
+            } else {
+                JamfProServer.url = jamfServerUrl_TextField.stringValue.baseUrl
+                jamfServerUrl_TextField.stringValue = JamfProServer.url
+            }
+        case "account":
+            JamfProServer.username = username_TextField.stringValue
+        case "credential":
+            JamfProServer.password = password_TextField.stringValue
+        default:
+            break
+        }
         
         saveCreds(server: JamfProServer.url, username: JamfProServer.username, password: JamfProServer.password)
     }
@@ -188,7 +205,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, URLSessionDelegate {
     // actions for preferences window - start
     
     func fetchPassword() {
-        let credentialsArray = Credentials().itemLookup(service: jamfServerUrl_TextField.stringValue.fqdnFromUrl)
+        let credentialsArray = Credentials().itemLookup(service: jamfServerUrl_TextField.stringValue.fqdn)
         if credentialsArray.count == 2 {
             username_TextField.stringValue = credentialsArray[0]
             password_TextField.stringValue = credentialsArray[1]
@@ -239,13 +256,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, URLSessionDelegate {
     }   // func alert_dialog - end
 
     func saveCreds(server: String, username: String, password: String) {
-        if ( server != "" && username != "" && password != "" ) {
-            
-            let urlRegex = try! NSRegularExpression(pattern: "http(.*?)://", options:.caseInsensitive)
-            let serverFqdn = urlRegex.stringByReplacingMatches(in: server, options: [], range: NSRange(0..<server.utf16.count), withTemplate: "")
-            
+        if !( server.isEmpty || username.isEmpty || password.isEmpty ) {
+                        
             JamfProServer.base64Creds = ("\(username):\(password)".data(using: .utf8)?.base64EncodedString())!
-            token.isValid = false
+            JamfProServer.validToken = false
+            
             // update the connection indicator for the site server
             Task {
                 if await TokenManager.shared.tokenInfo?.renewToken ?? true {
@@ -253,10 +268,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, URLSessionDelegate {
                 }
                 
                 if await TokenManager.shared.tokenInfo?.authMessage ?? "" == "success" {
+                    defaults.set(JamfProServer.url, forKey: "jamfServerUrl")
                     DispatchQueue.main.async {
                         self.siteConnectionStatus_ImageView.image = self.statusImage[1]
                     }
-                    Credentials().save(service: server.fqdnFromUrl, account: username, data: password)
+                    Credentials().save(service: server.fqdn, account: username, data: password)
                 } else {
                     print("authentication failed")
                     DispatchQueue.main.async {
@@ -296,11 +312,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, URLSessionDelegate {
             iconStyle_Button.selectItem(at: 1)
         }
         
-        let serverUrl = defaults.string(forKey:"jamfServerUrl") ?? ""
-        if serverUrl != "" {
+        var serverUrl = defaults.string(forKey:"jamfServerUrl") ?? ""
+        serverUrl = serverUrl.baseUrl
+        if !serverUrl.isEmpty {
             jamfServerUrl_TextField.stringValue = serverUrl
 
-            let credentialsArray = Credentials().itemLookup(service: serverUrl.fqdnFromUrl)
+            let credentialsArray = Credentials().itemLookup(service: serverUrl.fqdn)
             if credentialsArray.count == 2 {
                 JamfProServer.username = credentialsArray[0]
                 JamfProServer.password = credentialsArray[1]
@@ -348,45 +365,56 @@ class AppDelegate: NSObject, NSApplicationDelegate, URLSessionDelegate {
     @IBOutlet weak var default_15m_TextField: NSTextField!
     @IBOutlet weak var default_30m_TextField: NSTextField!
     
-    @IBAction func showHealthStatus_MenuItem(_ sender: NSMenuItem) {
-        if let api = HealthStatusStore.shared.healthStatus?.api,
-            let ui = HealthStatusStore.shared.healthStatus?.ui,
-            let enrollment = HealthStatusStore.shared.healthStatus?.enrollment,
-            let device = HealthStatusStore.shared.healthStatus?.device,
-            let defaultStatus = HealthStatusStore.shared.healthStatus?.healthStatusDefault {
-            
-            api_30s_TextField.stringValue = "\(Int(api.thirtySeconds * 100))%"
-            api_1m_TextField.stringValue  = "\(Int(api.oneMinute * 100))%"
-            api_5m_TextField.stringValue  = "\(Int(api.fiveMinutes * 100))%"
-            api_15m_TextField.stringValue = "\(Int(api.fifteenMinutes * 100))%"
-            api_30m_TextField.stringValue = "\(Int(api.thirtyMinutes * 100))%"
-            
-            ui_30s_TextField.stringValue = "\(Int(ui.thirtySeconds * 100))%"
-            ui_1m_TextField.stringValue  = "\(Int(ui.oneMinute * 100))%"
-            ui_5m_TextField.stringValue  = "\(Int(ui.fiveMinutes * 100))%"
-            ui_15m_TextField.stringValue = "\(Int(ui.fifteenMinutes * 100))%"
-            ui_30m_TextField.stringValue = "\(Int(ui.thirtyMinutes * 100))%"
-            
-            enrollment_30s_TextField.stringValue = "\(Int(enrollment.thirtySeconds * 100))%"
-            enrollment_1m_TextField.stringValue  = "\(Int(enrollment.oneMinute * 100))%"
-            enrollment_5m_TextField.stringValue  = "\(Int(enrollment.fiveMinutes * 100))%"
-            enrollment_15m_TextField.stringValue = "\(Int(enrollment.fifteenMinutes * 100))%"
-            enrollment_30m_TextField.stringValue = "\(Int(enrollment.thirtyMinutes * 100))%"
-            
-            device_30s_TextField.stringValue = "\(Int(device.thirtySeconds * 100))%"
-            device_1m_TextField.stringValue  = "\(Int(device.oneMinute * 100))%"
-            device_5m_TextField.stringValue  = "\(Int(device.fiveMinutes * 100))%"
-            device_15m_TextField.stringValue = "\(Int(device.fifteenMinutes * 100))%"
-            device_30m_TextField.stringValue = "\(Int(device.thirtyMinutes * 100))%"
-            
-            default_30s_TextField.stringValue = "\(Int(defaultStatus.thirtySeconds * 100))%"
-            default_1m_TextField.stringValue  = "\(Int(defaultStatus.oneMinute * 100))%"
-            default_5m_TextField.stringValue  = "\(Int(defaultStatus.fiveMinutes * 100))%"
-            default_15m_TextField.stringValue = "\(Int(defaultStatus.fifteenMinutes * 100))%"
-            default_30m_TextField.stringValue = "\(Int(defaultStatus.thirtyMinutes * 100))%"
-            
-            showOnActiveScreen(windowName: healthStatus_Window)
-        }
+    @MainActor @objc func updateHealthStatusView(_ notification: Notification) {
+        healthStatus_BringToFront(false)
+    }
+    
+    @IBAction func showHealthStatus_Action(_ sender: NSMenuItem) {
+        healthStatus_BringToFront(true)
+    }
+    
+    @MainActor
+    func healthStatus_BringToFront(_ bringToFront: Bool) {
+            if let api = HealthStatusStore.shared.healthStatus?.api,
+                let ui = HealthStatusStore.shared.healthStatus?.ui,
+                let enrollment = HealthStatusStore.shared.healthStatus?.enrollment,
+                let device = HealthStatusStore.shared.healthStatus?.device,
+                let defaultStatus = HealthStatusStore.shared.healthStatus?.healthStatusDefault {
+                
+                api_30s_TextField.stringValue = "\(Int(api.thirtySeconds * 100))%"
+                api_1m_TextField.stringValue  = "\(Int(api.oneMinute * 100))%"
+                api_5m_TextField.stringValue  = "\(Int(api.fiveMinutes * 100))%"
+                api_15m_TextField.stringValue = "\(Int(api.fifteenMinutes * 100))%"
+                api_30m_TextField.stringValue = "\(Int(api.thirtyMinutes * 100))%"
+                
+                ui_30s_TextField.stringValue = "\(Int(ui.thirtySeconds * 100))%"
+                ui_1m_TextField.stringValue  = "\(Int(ui.oneMinute * 100))%"
+                ui_5m_TextField.stringValue  = "\(Int(ui.fiveMinutes * 100))%"
+                ui_15m_TextField.stringValue = "\(Int(ui.fifteenMinutes * 100))%"
+                ui_30m_TextField.stringValue = "\(Int(ui.thirtyMinutes * 100))%"
+                
+                enrollment_30s_TextField.stringValue = "\(Int(enrollment.thirtySeconds * 100))%"
+                enrollment_1m_TextField.stringValue  = "\(Int(enrollment.oneMinute * 100))%"
+                enrollment_5m_TextField.stringValue  = "\(Int(enrollment.fiveMinutes * 100))%"
+                enrollment_15m_TextField.stringValue = "\(Int(enrollment.fifteenMinutes * 100))%"
+                enrollment_30m_TextField.stringValue = "\(Int(enrollment.thirtyMinutes * 100))%"
+                
+                device_30s_TextField.stringValue = "\(Int(device.thirtySeconds * 100))%"
+                device_1m_TextField.stringValue  = "\(Int(device.oneMinute * 100))%"
+                device_5m_TextField.stringValue  = "\(Int(device.fiveMinutes * 100))%"
+                device_15m_TextField.stringValue = "\(Int(device.fifteenMinutes * 100))%"
+                device_30m_TextField.stringValue = "\(Int(device.thirtyMinutes * 100))%"
+                
+                default_30s_TextField.stringValue = "\(Int(defaultStatus.thirtySeconds * 100))%"
+                default_1m_TextField.stringValue  = "\(Int(defaultStatus.oneMinute * 100))%"
+                default_5m_TextField.stringValue  = "\(Int(defaultStatus.fiveMinutes * 100))%"
+                default_15m_TextField.stringValue = "\(Int(defaultStatus.fifteenMinutes * 100))%"
+                default_30m_TextField.stringValue = "\(Int(defaultStatus.thirtyMinutes * 100))%"
+
+                if !healthStatusIsVisible() || bringToFront {
+                    showOnActiveScreen(windowName: healthStatus_Window)
+                }
+            }
     }
     
     func showOnActiveScreen(windowName: NSWindow) {
@@ -402,7 +430,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, URLSessionDelegate {
             xPos = currentFrameWidth - windowWidth + Double(screen.frame.origin.x) - 20.0
             yPos = currentFrameHeight - windowHeight + Double(screen.frame.origin.y) - 40.0
         }
-//            windowName.collectionBehavior = NSWindow.CollectionBehavior.moveToActiveSpace
+
         windowName.setFrameOrigin(NSPoint(x: xPos, y: yPos))
         windowName.setIsVisible(true)
                 
@@ -428,3 +456,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, URLSessionDelegate {
     
 }
 
+extension Notification.Name {
+    public static let updateHealthStatusView = Notification.Name("updateHealthStatusView")
+}
diff --git a/jamfStatus/Base.lproj/MainMenu.xib b/jamfStatus/Base.lproj/MainMenu.xib
index 3985fec..6c7f973 100644
--- a/jamfStatus/Base.lproj/MainMenu.xib
+++ b/jamfStatus/Base.lproj/MainMenu.xib
@@ -54,6 +54,7 @@
                 <outlet property="prefWindowAlerts_Button" destination="SLI-gn-Ejs" id="ckP-0i-7tD"/>
                 <outlet property="prefWindowIcon_Button" destination="qeJ-Bb-E0c" id="nQs-Cu-bqO"/>
                 <outlet property="prefs_Window" destination="WEB-hD-Ngs" id="mHB-Yd-z5M"/>
+                <outlet property="showHealthStatus_MenuItem" destination="Wqs-QH-aUg" id="Ehj-iD-rB3"/>
                 <outlet property="siteConnectionStatus_ImageView" destination="qwn-kK-uEc" id="jSQ-c5-gEe"/>
                 <outlet property="ui_15m_TextField" destination="yRh-d1-vLK" id="w0B-ng-ugg"/>
                 <outlet property="ui_1m_TextField" destination="J8d-b5-d7z" id="PQS-Nn-kdv"/>
@@ -117,7 +118,7 @@
                 <menuItem title="Health Status..." id="Wqs-QH-aUg">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
-                        <action selector="showHealthStatus_MenuItem:" target="Voe-Tx-rLC" id="Hp0-Od-brh"/>
+                        <action selector="showHealthStatus_Action:" target="-1" id="8W4-Qy-THA"/>
                     </connections>
                 </menuItem>
                 <menuItem title="Notifications" id="9Lr-kF-tbc">
@@ -158,7 +159,7 @@
                     </connections>
                 </menuItem>
             </items>
-            <point key="canvasLocation" x="-182" y="-156"/>
+            <point key="canvasLocation" x="-182" y="-156.5"/>
         </menu>
         <window title="Jamf Cloud Status" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" titleVisibility="hidden" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
@@ -491,7 +492,7 @@
                             <action selector="credentials_Action:" target="Voe-Tx-rLC" id="fwf-30-4UF"/>
                         </connections>
                     </textField>
-                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zDZ-oy-eFu">
+                    <textField identifier="account" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zDZ-oy-eFu">
                         <rect key="frame" x="82" y="65" width="218" height="22"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="218" id="aLp-mt-Acs"/>
@@ -506,7 +507,7 @@
                             <action selector="credentials_Action:" target="Voe-Tx-rLC" id="sKb-WH-I93"/>
                         </connections>
                     </textField>
-                    <secureTextField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iJJ-5w-6g2">
+                    <secureTextField identifier="credential" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iJJ-5w-6g2">
                         <rect key="frame" x="82" y="39" width="218" height="22"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="22" id="jWI-Wc-qV6"/>
@@ -615,7 +616,7 @@
                     <constraint firstAttribute="trailing" secondItem="SLI-gn-Ejs" secondAttribute="trailing" constant="32" id="zgB-xV-qpa"/>
                 </constraints>
             </view>
-            <point key="canvasLocation" x="-841" y="-46.5"/>
+            <point key="canvasLocation" x="-572" y="-19"/>
         </window>
         <window title="About" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="LmC-DW-plF" userLabel="About Window">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES"/>
@@ -662,7 +663,7 @@
                         <rect key="frame" x="44" y="71" width="584" height="161"/>
                         <clipView key="contentView" drawsBackground="NO" id="oRl-Lg-qHC">
                             <rect key="frame" x="0.0" y="0.0" width="584" height="161"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <autoresizingMask key="autoresizingMask"/>
                             <subviews>
                                 <textView wantsLayer="YES" editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" spellingCorrection="YES" id="Qle-yc-3zd">
                                     <rect key="frame" x="0.0" y="0.0" width="584" height="161"/>
@@ -713,12 +714,12 @@
             </view>
             <point key="canvasLocation" x="-146" y="255"/>
         </window>
-        <window title="Health Status" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="XqO-ps-oTf">
+        <window identifier="healthStatusWindow" title="Health Status" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="XqO-ps-oTf">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="1725" y="142" width="566" height="668"/>
-            <rect key="screenRect" x="739" y="982" width="1920" height="1050"/>
-            <view key="contentView" id="6iB-xm-KCd">
+            <rect key="screenRect" x="1512" y="-83" width="2048" height="1122"/>
+            <view key="contentView" identifier="healthStatusView" id="6iB-xm-KCd">
                 <rect key="frame" x="0.0" y="0.0" width="566" height="668"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
@@ -776,7 +777,7 @@
                             <constraint firstAttribute="width" constant="60" id="Muk-dJ-egS"/>
                             <constraint firstAttribute="height" constant="24" id="New-fI-FR8"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="reH-Qs-afh">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="reH-Qs-afh">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -788,7 +789,7 @@
                             <constraint firstAttribute="width" constant="60" id="91O-fc-Sa1"/>
                             <constraint firstAttribute="height" constant="24" id="NgC-4T-EJ0"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="Ef9-uL-Cte">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="Ef9-uL-Cte">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -800,7 +801,7 @@
                             <constraint firstAttribute="width" constant="60" id="0q0-nh-m3B"/>
                             <constraint firstAttribute="height" constant="24" id="uWy-mC-Fsi"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="7nn-Zj-kjL">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="7nn-Zj-kjL">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -812,7 +813,7 @@
                             <constraint firstAttribute="width" constant="60" id="1XZ-fu-GDB"/>
                             <constraint firstAttribute="height" constant="24" id="VKN-xX-pKE"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="OSc-lG-5v1">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="OSc-lG-5v1">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -824,7 +825,7 @@
                             <constraint firstAttribute="height" constant="24" id="PtY-Ub-59c"/>
                             <constraint firstAttribute="width" constant="60" id="qg8-mm-UlA"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="I09-lb-3mi">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="I09-lb-3mi">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -884,7 +885,7 @@
                             <constraint firstAttribute="height" constant="24" id="C40-cx-GZJ"/>
                             <constraint firstAttribute="width" constant="60" id="RQN-PV-seh"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="aer-rx-Hgn">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="aer-rx-Hgn">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -896,7 +897,7 @@
                             <constraint firstAttribute="width" constant="60" id="IBM-jn-crN"/>
                             <constraint firstAttribute="height" constant="24" id="aVi-3f-n1f"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="hyc-Th-qcd">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="hyc-Th-qcd">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -908,7 +909,7 @@
                             <constraint firstAttribute="width" constant="60" id="PHA-Lp-J33"/>
                             <constraint firstAttribute="height" constant="24" id="fc3-ZE-Hy8"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="kC8-KA-ilT">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="kC8-KA-ilT">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -920,7 +921,7 @@
                             <constraint firstAttribute="height" constant="24" id="Oiu-qe-OqQ"/>
                             <constraint firstAttribute="width" constant="60" id="qLr-sS-Pe2"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="hLl-BH-NGh">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="hLl-BH-NGh">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -932,7 +933,7 @@
                             <constraint firstAttribute="width" constant="60" id="3cA-qy-PTL"/>
                             <constraint firstAttribute="height" constant="24" id="ZLi-ck-yQI"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="daN-vt-X61">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="daN-vt-X61">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1000,7 +1001,7 @@
                             <constraint firstAttribute="height" constant="24" id="7j4-c4-fZh"/>
                             <constraint firstAttribute="width" constant="60" id="FPH-QE-j8S"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="NRE-Kt-3Xc">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="NRE-Kt-3Xc">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1012,7 +1013,7 @@
                             <constraint firstAttribute="height" constant="24" id="F8y-ZG-HSE"/>
                             <constraint firstAttribute="width" constant="60" id="Fxn-21-QtX"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="UMw-nc-aDX">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="UMw-nc-aDX">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1024,7 +1025,7 @@
                             <constraint firstAttribute="height" constant="24" id="3uZ-Xv-Cox"/>
                             <constraint firstAttribute="width" constant="60" id="DQF-G6-jmU"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="Yxz-Mq-xfZ">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="Yxz-Mq-xfZ">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1036,7 +1037,7 @@
                             <constraint firstAttribute="height" constant="24" id="HCz-f4-C3n"/>
                             <constraint firstAttribute="width" constant="60" id="mOs-5r-Zrn"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="YbM-Qi-gOO">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="YbM-Qi-gOO">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1048,7 +1049,7 @@
                             <constraint firstAttribute="width" constant="60" id="3py-gf-Z57"/>
                             <constraint firstAttribute="height" constant="24" id="HvX-P0-vjI"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="wsr-mQ-MKN">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="wsr-mQ-MKN">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1108,7 +1109,7 @@
                             <constraint firstAttribute="height" constant="24" id="IaC-uv-HIR"/>
                             <constraint firstAttribute="width" constant="60" id="PD4-0z-neY"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="qSb-MC-4Hq">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="qSb-MC-4Hq">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1120,7 +1121,7 @@
                             <constraint firstAttribute="height" constant="24" id="OhQ-ko-JhY"/>
                             <constraint firstAttribute="width" constant="60" id="P1r-3P-Tvg"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="TM4-Zb-WC0">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="TM4-Zb-WC0">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1132,7 +1133,7 @@
                             <constraint firstAttribute="width" constant="60" id="Jfl-ZQ-yg2"/>
                             <constraint firstAttribute="height" constant="24" id="Jwx-3p-w7s"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="Hd1-NF-ug9">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="Hd1-NF-ug9">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1144,7 +1145,7 @@
                             <constraint firstAttribute="height" constant="24" id="0ax-2W-VDO"/>
                             <constraint firstAttribute="width" constant="60" id="bKn-DL-39q"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="Rwj-aa-9oE">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="Rwj-aa-9oE">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1156,7 +1157,7 @@
                             <constraint firstAttribute="width" constant="60" id="HkA-Tz-dym"/>
                             <constraint firstAttribute="height" constant="24" id="dsQ-xb-0c8"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="u9f-7y-Ufz">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="u9f-7y-Ufz">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1216,7 +1217,7 @@
                             <constraint firstAttribute="width" constant="60" id="D5u-1e-Tqv"/>
                             <constraint firstAttribute="height" constant="24" id="Tbq-EW-D0h"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="KGA-aG-1ld">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="KGA-aG-1ld">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1228,7 +1229,7 @@
                             <constraint firstAttribute="width" constant="60" id="6pD-qb-vkY"/>
                             <constraint firstAttribute="height" constant="24" id="WD3-y9-e79"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="BqI-4G-PiF">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="BqI-4G-PiF">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1240,7 +1241,7 @@
                             <constraint firstAttribute="height" constant="24" id="h1s-95-G97"/>
                             <constraint firstAttribute="width" constant="60" id="u75-5x-mWR"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="Xnp-Bj-G80">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="Xnp-Bj-G80">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1252,7 +1253,7 @@
                             <constraint firstAttribute="width" constant="60" id="Jso-NK-4tN"/>
                             <constraint firstAttribute="height" constant="24" id="Oj4-tK-Vew"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="owU-Nr-bh1">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="owU-Nr-bh1">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1264,7 +1265,7 @@
                             <constraint firstAttribute="height" constant="24" id="MDG-Tl-bnp"/>
                             <constraint firstAttribute="width" constant="60" id="dwj-pT-iQg"/>
                         </constraints>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="lYT-sd-G82">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="right" drawsBackground="YES" id="lYT-sd-G82">
                             <font key="font" metaFont="system" size="18"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
diff --git a/jamfStatus/Credentials2.swift b/jamfStatus/Credentials2.swift
deleted file mode 100644
index c94344b..0000000
--- a/jamfStatus/Credentials2.swift
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-//  Credentials2.swift
-//  jamfStatus
-//
-//  Created by Leslie Helou on 9/11/19.
-//  Copyright © 2019 Leslie Helou. All rights reserved.
-//
-
-import Foundation
-import Security
-
-let kSecAttrAccountString          = NSString(format: kSecAttrAccount)
-let kSecValueDataString            = NSString(format: kSecValueData)
-let kSecClassGenericPasswordString = NSString(format: kSecClassGenericPassword)
-let keychainQ                      = DispatchQueue(label: "com.jamf.objectinfo", qos: DispatchQoS.background)
-
-class Credentials2 {
-    
-    func save(service: String, account: String, data: String) {
-        
-        keychainQ.async { [self] in
-            if let password = data.data(using: String.Encoding.utf8) {
-                var keychainQuery: [String: Any] = [kSecClass as String: kSecClassGenericPassword,
-                                                    kSecAttrService as String: service,
-                                                    kSecAttrAccount as String: account,
-                                                    kSecValueData as String: password]
-                
-                // see if credentials already exist for server
-                let accountCheck = retrieve(service: service)
-                if accountCheck.count == 0 {
-                    // try to add new credentials, if account exists we'll try updating it
-                    let addStatus = SecItemAdd(keychainQuery as CFDictionary, nil)
-                    if (addStatus != errSecSuccess) {
-                        if let addErr = SecCopyErrorMessageString(addStatus, nil) {
-                            print("[addStatus] Write failed for new credentials: \(addErr)")
-                        }
-                    }
-                } else {
-                    // credentials already exist, try to update
-                    keychainQuery = [kSecClass as String: kSecClassGenericPasswordString,
-                                     kSecAttrService as String: service,
-                                     kSecMatchLimit as String: kSecMatchLimitOne,
-                                     kSecReturnAttributes as String: true]
-                    let updateStatus = SecItemUpdate(keychainQuery as CFDictionary, [kSecAttrAccountString:account,kSecValueDataString:password] as CFDictionary)
-                    if (updateStatus != errSecSuccess) {
-                        if let updateErr = SecCopyErrorMessageString(updateStatus, nil) {
-                            print("[updateStatus] Update failed for existing credentials: \(updateErr)")
-                        }
-                    }
-                }
-            }
-        }
-    }   // func save - end
-    
-    func retrieve(service: String) -> [String] {
-        
-        var storedCreds = [String]()
-        
-        let keychainQuery: [String: Any] = [kSecClass as String: kSecClassGenericPasswordString,
-                                            kSecAttrService as String: service,
-                                            kSecMatchLimit as String: kSecMatchLimitOne,
-                                            kSecReturnAttributes as String: true,
-                                            kSecReturnData as String: true]
-        var item: CFTypeRef?
-        let status = SecItemCopyMatching(keychainQuery as CFDictionary, &item)
-        guard status != errSecItemNotFound else { return [] }
-        guard status == errSecSuccess else { return [] }
-        
-        guard let existingItem = item as? [String : Any],
-            let passwordData = existingItem[kSecValueData as String] as? Data,
-            let account = existingItem[kSecAttrAccount as String] as? String,
-            let password = String(data: passwordData, encoding: String.Encoding.utf8)
-            else {
-                return []
-        }
-        storedCreds.append(account)
-        storedCreds.append(password)
-        return storedCreds
-    }
-    
-}
diff --git a/jamfStatus/Globals.swift b/jamfStatus/Globals.swift
index 0ba9cdb..590d553 100644
--- a/jamfStatus/Globals.swift
+++ b/jamfStatus/Globals.swift
@@ -33,6 +33,7 @@ var isDarkMode: Bool {
     return mode == "Dark"
 }
 var defaultTextColor = isDarkMode ? NSColor.white:NSColor.black
+var refreshHealthStatus: Bool = false
 
 struct JamfNotification {
     static let key = ["TOMCAT_SSL_CERT_EXPIRED":"CERT_EXPIRED",
@@ -189,49 +190,62 @@ struct Preferences {
     static var menuIconStyle                = "color"
 }
 
+public func healthStatusIsVisible() -> Bool {
+    refreshHealthStatus = false
 
-struct token {
-    static var refreshInterval:UInt32 = 10*60  // 10 minutes
-    static var sourceServer  = ""
-    static var sourceExpires = ""
-    static var startTime     = Date()
-    static var isValid       = false
+    let options: CGWindowListOption = [.excludeDesktopElements, .optionOnScreenOnly]
+    guard let windowListInfo = CGWindowListCopyWindowInfo(options, kCGNullWindowID) as? [[CFString: Any]] else {
+        return false
+    }
+
+    refreshHealthStatus = windowListInfo.contains { windowInfo in
+        guard let ownerName = windowInfo[kCGWindowOwnerName] as? String,
+              let windowName = windowInfo[kCGWindowName] as? String else {
+            return false
+        }
+        return ownerName == "jamfStatus" && windowName == "Health Status"
+    }
+    return refreshHealthStatus
 }
 
 public func timeDiff(startTime: Date) -> (Int, Int, Int, Double) {
     let endTime = Date()
-//                    let components = Calendar.current.dateComponents([.second, .nanosecond], from: startTime, to: endTime)
-//                    let timeDifference = Double(components.second!) + Double(components.nanosecond!)/1000000000
-//                    WriteToLog().message(stringOfText: "[ViewController.download] time difference: \(timeDifference) seconds")
     let components = Calendar.current.dateComponents([
         .hour, .minute, .second, .nanosecond], from: startTime, to: endTime)
     var diffInSeconds = Double(components.hour!)*3600 + Double(components.minute!)*60 + Double(components.second!) + Double(components.nanosecond!)/1000000000
     diffInSeconds = Double(round(diffInSeconds * 1000) / 1000)
-//    let timeDifference = Int(components.second!) //+ Double(components.nanosecond!)/1000000000
-//    let (h,r) = timeDifference.quotientAndRemainder(dividingBy: 3600)
-//    let (m,s) = r.quotientAndRemainder(dividingBy: 60)
-//    WriteToLog().message(stringOfText: "[ViewController.download] download time: \(h):\(m):\(s) (h:m:s)")
+
     return (Int(components.hour!), Int(components.minute!), Int(components.second!), diffInSeconds)
-//    return (h, m, s)
 }
 
 extension String {
-    var fqdnFromUrl: String {
+    var baseUrl: String {
         get {
-            var fqdn = ""
-            let nameArray = self.components(separatedBy: "/")
-            if nameArray.count > 2 {
-                fqdn = nameArray[2]
-            } else {
-                fqdn =  self
+            guard let url = URL(string: self),
+                  let scheme = url.scheme,
+                  let host = url.host else {
+                return ""
             }
-            if fqdn.contains(":") {
-                let fqdnArray = fqdn.components(separatedBy: ":")
-                fqdn = fqdnArray[0]
+            
+            // Construct base URL with scheme and host
+            var baseURL = "\(scheme)://\(host)"
+            
+            // Include port if it exists and is not default
+            if let port = url.port {
+                baseURL += ":\(port)"
+            }
+                
+            return baseURL
+        }
+    }
+    var fqdn: String {
+        get {
+            guard let url = URL(string: self),
+                  let host = url.host else {
+                return ""
             }
-            let urlRegex = try! NSRegularExpression(pattern: "/?failover(.*?)", options:.caseInsensitive)
-            fqdn = urlRegex.stringByReplacingMatches(in: fqdn, options: [], range: NSRange(0..<fqdn.utf16.count), withTemplate: "")
-            return fqdn
+                
+            return host
         }
     }
 }
diff --git a/jamfStatus/LoggerExtension.swift b/jamfStatus/LoggerExtension.swift
index f66f861..f477154 100644
--- a/jamfStatus/LoggerExtension.swift
+++ b/jamfStatus/LoggerExtension.swift
@@ -10,4 +10,5 @@ extension Logger {
     
     static let check = Logger(subsystem: subsystem, category: "check")
     static let token = Logger(subsystem: subsystem, category: "token")
+    static let jpapi = Logger(subsystem: subsystem, category: "jpapi")
 }
diff --git a/jamfStatus/StatusMenuController.swift b/jamfStatus/StatusMenuController.swift
index 6841aaa..b31a271 100644
--- a/jamfStatus/StatusMenuController.swift
+++ b/jamfStatus/StatusMenuController.swift
@@ -122,12 +122,12 @@ class StatusMenuController: NSObject, URLSessionDelegate, URLSessionTaskDelegate
         // set menu icon style
         prefs.menuIconStyle = defaults.string(forKey: "menuIconStyle") ?? prefs.menuIconStyle
         
-        if (defaults.object(forKey:"jamfServerUrl") as? String == nil) {
+        if (defaults.string(forKey:"jamfServerUrl") == nil) || (defaults.string(forKey:"jamfServerUrl") == "") {
             defaults.set("", forKey: "jamfServerUrl")
             JamfProServer.url = ""
         } else {
-            JamfProServer.url = defaults.string(forKey:"jamfServerUrl")!
-            let credentialsArray = Credentials().itemLookup(service: JamfProServer.url.fqdnFromUrl)
+            JamfProServer.url = (defaults.string(forKey:"jamfServerUrl") ?? "").baseUrl
+            let credentialsArray = Credentials().itemLookup(service: JamfProServer.url.fqdn)
             if credentialsArray.count == 2 {
                 JamfProServer.username = credentialsArray[0]
                 JamfProServer.password = credentialsArray[1]
@@ -136,7 +136,6 @@ class StatusMenuController: NSObject, URLSessionDelegate, URLSessionTaskDelegate
             }
         }
         
-        
         icon = NSImage(named: iconName)
 //        icon?.isTemplate = true // best for dark mode?
 //        cloudStatusItem.image = icon
@@ -422,6 +421,8 @@ class StatusMenuController: NSObject, URLSessionDelegate, URLSessionTaskDelegate
             Logger.check.info("health status was not updated")
             throw HealthStatusError.authenticationFailed
         }
+        
+        refreshHealthStatus = healthStatusIsVisible()
 
         Logger.check.info("checking server health status")
 
@@ -446,8 +447,36 @@ class StatusMenuController: NSObject, URLSessionDelegate, URLSessionTaskDelegate
         let decodedHealthStatus = try JSONDecoder().decode(HealthStatus.self, from: data)
 
         HealthStatusStore.shared.update(from: decodedHealthStatus)
+        if refreshHealthStatus {
+            NotificationCenter.default.post(name: .updateHealthStatusView, object: self)
+        }
 
         Logger.check.info("health status updated")
+        
+        // log rates below 1.0
+        if let _ = HealthStatusStore.shared.healthStatus {
+            await logHealthStatus(HealthStatusStore.shared.healthStatus!.api, area: "API")
+            await logHealthStatus(HealthStatusStore.shared.healthStatus!.ui, area: "UI")
+            await logHealthStatus(HealthStatusStore.shared.healthStatus!.enrollment, area: "Enrollment")
+            await logHealthStatus(HealthStatusStore.shared.healthStatus!.device, area: "Device")
+            await logHealthStatus(HealthStatusStore.shared.healthStatus!.healthStatusDefault, area: "Default")
+        }
+    }
+    
+    private func logHealthStatus(_ values: API, area: String) async {
+        let apiMirror = Mirror(reflecting: values as API)
+        var percents: [String] = []
+        for timeInterval in apiMirror.children {
+            if let label = timeInterval.label {
+                if let theRate = timeInterval.value as? Double, theRate < 1.0  {
+                    percents.append("    \(label): \(timeInterval.value)")
+                }
+            }
+        }
+        if !percents.isEmpty {
+            writeToLog.message(stringOfText: ["\(area) rate warning:"])
+            writeToLog.message(stringOfText: percents)
+        }
     }
 
     func urlSession(_ session: URLSession, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping(  URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
diff --git a/jamfStatus/TokenManager.swift b/jamfStatus/TokenManager.swift
index 53e142e..a5d1986 100644
--- a/jamfStatus/TokenManager.swift
+++ b/jamfStatus/TokenManager.swift
@@ -104,6 +104,7 @@ actor TokenManager {
             }
 
             JamfProServer.accessToken = newTokenInfo.token
+            JamfProServer.validToken = true
             Logger.check.debug("granted new token, expires \(newTokenInfo.expiresAt, privacy: .public)")
             
             await MainActor.run {
diff --git a/jamfStatus/UapiCall.swift b/jamfStatus/UapiCall.swift
index 94fb66c..507bc8f 100644
--- a/jamfStatus/UapiCall.swift
+++ b/jamfStatus/UapiCall.swift
@@ -11,6 +11,7 @@
 
 
 import Foundation
+import OSLog
 
 class UapiCall: NSObject, URLSessionDelegate, URLSessionDataDelegate, URLSessionTaskDelegate {
     
@@ -19,7 +20,7 @@ class UapiCall: NSObject, URLSessionDelegate, URLSessionDataDelegate, URLSession
     func get(endpoint: String, completion: @escaping (_ notificationAlerts: [Dictionary<String,Any>]) -> Void) {
                 
         Task {
-            if await TokenManager.shared.tokenInfo?.renewToken ?? true {
+            if await TokenManager.shared.tokenInfo?.renewToken ?? true || !JamfProServer.validToken {
                 await TokenManager.shared.setToken(serverUrl: JamfProServer.url, username: JamfProServer.username.lowercased(), password: JamfProServer.password)
             }
             
@@ -49,22 +50,32 @@ class UapiCall: NSObject, URLSessionDelegate, URLSessionDataDelegate, URLSession
                         (data, response, error) -> Void in
                         if let httpResponse = response as? HTTPURLResponse {
                             if httpResponse.statusCode >= 200 && httpResponse.statusCode <= 299 {
-                                let json = try? JSONSerialization.jsonObject(with: data!, options: .allowFragments)
-                                if let notificationsDictArray = json! as? [[String: Any]] {
-                                    completion(notificationsDictArray)
-                                    return
-                                } else {    // if let endpointJSON error
-                                    print("[UapiCall] get JSON error")
-                                    completion([])
-                                    return
+                                do {
+                                    let json = try JSONSerialization.jsonObject(with: data!, options: .allowFragments)
+                                    if let notificationsDictArray = json as? [[String: Any]] {
+                                        completion(notificationsDictArray)
+                                        return
+                                    } else {
+                                        Logger.jpapi.info("An error creating notifications array")
+                                        let dataString = String(data: data!, encoding: .utf8) ?? "No data"
+                                        Logger.jpapi.info("returned data: \(dataString, privacy: .public)")
+                                        completion([])
+                                        return
+                                    }
+                                } catch {
+                                    Logger.jpapi.info("An error parsing notification data occurred: \(error.localizedDescription, privacy: .public)")
                                 }
                             } else {    // if httpResponse.statusCode <200 or >299
-                                print("[UapiCall] \(endpoint) - get response error: \(httpResponse.statusCode)")
+                                Logger.jpapi.debug("\(endpoint, privacy: .public) - get response error: \(httpResponse.statusCode, privacy: .public)")
+                                if httpResponse.statusCode == 401 {
+                                    JamfProServer.accessToken = ""
+                                    JamfProServer.validToken = false
+                                }
                                 completion([])
                                 return
                             }
                         } else {
-                            print("\n HTTP error \n")
+                            Logger.jpapi.info("An error occurred: \(error!.localizedDescription, privacy: .public)")
                         }
                     })
                     task.resume()