diff --git a/Server/Components/Devices/ChatCard.razor b/Server/Components/Devices/ChatCard.razor
index 3bfc7e8c..bdaeb179 100644
--- a/Server/Components/Devices/ChatCard.razor
+++ b/Server/Components/Devices/ChatCard.razor
@@ -5,7 +5,7 @@
     <div class="chat-header bg-primary text-white p-2" @onclick="HeaderClicked">
         <h6 class="mt-3">
             <i class="oi oi-chat me-1"></i>
-            <span class="badge badge-info badge-pill me-1">
+            <span class="badge bg-info rounded-pill me-1">
                 @Session.MissedChats
             </span>
             @Session.DeviceName
diff --git a/Server/Components/Pages/ApiKeys.razor b/Server/Components/Pages/ApiKeys.razor
index 40e4c731..003bd73b 100644
--- a/Server/Components/Pages/ApiKeys.razor
+++ b/Server/Components/Pages/ApiKeys.razor
@@ -37,7 +37,7 @@ else if (User is not null)
     <div class="mb-2 mt-4">
         <label class="me-1">New Token Name:</label>
         <input @bind="_createKeyName" @bind:event="oninput"
-               class="form-control form-control-sm custom-control-inline me-1"
+               class="form-control form-control-sm custom-control-inline me-1 d-inline-block"
                style="width:200px" />
 
         <button class="btn btn-primary" type="button" @onclick="CreateNewKey">Create</button>
diff --git a/Server/Components/Pages/ServerConfig.razor b/Server/Components/Pages/ServerConfig.razor
index 15427ae0..6c322e46 100644
--- a/Server/Components/Pages/ServerConfig.razor
+++ b/Server/Components/Pages/ServerConfig.razor
@@ -13,7 +13,7 @@
             <div class="d-inline-block text-center me-2">
                 <label>Devices Online</label>
                 <br />
-                <span class="badge badge-primary p-2">@ServiceSessionCache.GetAllDevices().Count</span>
+                <span class="badge text-bg-primary p-2">@ServiceSessionCache.GetAllDevices().Count</span>
             </div>
 
             <div class="d-inline-block text-center me-2">
@@ -23,7 +23,7 @@
                 <button class="btn btn-sm btn-secondary" @onclick="ShowOutdatedDevices">
                     <i class="oi oi-question-mark"></i>
                 </button>
-                <span class="badge badge-primary p-2 mx-2">@(OutdatedDevices?.Count() ?? 0)</span>
+                <span class="badge text-bg-primary p-2 mx-2">@(OutdatedDevices?.Count() ?? 0)</span>
                 <button class="btn btn-secondary btn-sm" type="button" title="Update All" @onclick="UpdateAllDevices">
                     <span class="oi oi-reload"></span>
                 </button>
@@ -32,12 +32,12 @@
             <div class="d-inline-block text-center me-2">
                 <label>Devices Total</label>
                 <br />
-                <span class="badge badge-primary p-2">@TotalDevices</span>
+                <span class="badge text-bg-primary p-2">@TotalDevices</span>
             </div>
             <div class="d-inline-block text-center me-2">
                 <label>Active Users</label>
                 <br />
-                <span class="badge badge-primary p-2">@CircuitManager.Connections.Count</span>
+                <span class="badge text-bg-primary p-2">@CircuitManager.Connections.Count</span>
             </div>
         </div>
     </div>
diff --git a/Server/wwwroot/css/site.css b/Server/wwwroot/css/site.css
index 7c6dcb30..f05b062e 100644
--- a/Server/wwwroot/css/site.css
+++ b/Server/wwwroot/css/site.css
@@ -79,4 +79,8 @@ input[disabled], input[readonly], select[disabled] {
 
 .pointer {
     cursor: pointer;
+}
+
+#components-reconnect-modal {
+    color: black;
 }
\ No newline at end of file