diff --git a/Basic/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs b/Basic/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs
index 0e5149a18..f9a4d1286 100644
--- a/Basic/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs
+++ b/Basic/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs
@@ -149,19 +149,18 @@ void EnableAndHighlightButtons(Button buttonToHighlight, bool enable)
 
         void SetButtonStateAndColor(Button button, bool highlight, bool enable)
         {
+            button.SetEnabled(enable);
+
             if (enable)
             {
                 button.RemoveFromClassList("UseCaseButtonHighlight");
-                button.AddToClassList("UseCaseButton");
+                return;
             }
 
-            else
+            if (highlight)
             {
-                button.RemoveFromClassList("UseCaseButton");
-                button.AddToClassList(highlight ? "UseCaseButtonHighlight" : "UseCaseButton");
+                button.AddToClassList("UseCaseButtonHighlight");
             }
-
-            button.SetEnabled(enable);
         }
     }
 }
diff --git a/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml b/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml
index ea19ba640..f27a6f4c2 100644
--- a/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml	
+++ b/Basic/MultiplayerUseCases/Assets/UI Toolkit/NetworkManagerUI.uxml	
@@ -1,14 +1,14 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <Style src="project://database/Assets/UI%20Toolkit/UseCasesStyleClass.uss?fileID=7433441132597879392&amp;guid=cac46a420be955345b18ac0d5d2d9e37&amp;type=3#UseCasesStyleClass" />
-    <ui:VisualElement name="NetworkManagerUI" style="position: absolute; background-color: rgb(40, 40, 42); max-width: 200px; min-width: 100px; display: flex; border-top-left-radius: 7px; border-top-right-radius: 7px; border-bottom-right-radius: 7px; border-bottom-left-radius: 7px; right: 0; justify-content: center; width: 25%; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 5px; padding-right: 5px; padding-bottom: 5px; padding-left: 5px; border-top-width: 7px; border-right-width: 7px; border-bottom-width: 7px; border-left-width: 7px; top: 0;">
+    <ui:VisualElement name="NetworkManagerUI">
         <ui:Label text="IP Address" display-tooltip-when-elided="true" name="IPLabel" class="labelText" style="flex-shrink: 1; flex-direction: row; display: flex;" />
-        <ui:TextField text="127.0.0.1" name="IPAddressField" focusable="true" is-delayed="true" password="false" tabindex="1" class="button" />
+        <ui:TextField name="IPAddressField" focusable="true" is-delayed="true" password="false" tabindex="1" value="127.0.0.1" />
         <ui:Label text="Port" display-tooltip-when-elided="true" name="PortLabel" class="labelText" style="flex-shrink: 1; flex-direction: row;" />
-        <ui:TextField text="7979" name="PortField" focusable="true" is-delayed="true" tabindex="2" class="button" />
-        <ui:Button text="Server" display-tooltip-when-elided="true" name="ServerButton" parse-escape-sequences="true" class="button UseCaseButton" style="margin-top: 8px;" />
-        <ui:Button text="Host" parse-escape-sequences="true" display-tooltip-when-elided="true" name="HostButton" class="UseCaseButtonActive UseCaseButton" />
-        <ui:Button text="Client" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ClientButton" class="button UseCaseButtonActive UseCaseButton" />
-        <ui:Button text="Disconnect" parse-escape-sequences="true" display-tooltip-when-elided="true" name="DisconnectButton" class="button UseCaseButtonActive UseCaseButton" style="margin-top: 14px;" />
-        <ui:Button text="Quit Scene" parse-escape-sequences="true" display-tooltip-when-elided="true" name="QuitSceneButton" class="button UseCaseButtonActive UseCaseButton" />
+        <ui:TextField name="PortField" focusable="true" is-delayed="true" tabindex="2" value="7979" />
+        <ui:Button text="Server" display-tooltip-when-elided="true" name="ServerButton" parse-escape-sequences="true" class="UseCaseButton" style="margin-top: 8px;" />
+        <ui:Button text="Host" parse-escape-sequences="true" display-tooltip-when-elided="true" name="HostButton" class="UseCaseButton" />
+        <ui:Button text="Client" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ClientButton" class="button UseCaseButton" />
+        <ui:Button text="Disconnect" parse-escape-sequences="true" display-tooltip-when-elided="true" name="DisconnectButton" class="button UseCaseButton" style="margin-top: 14px;" />
+        <ui:Button text="Quit Scene" parse-escape-sequences="true" display-tooltip-when-elided="true" name="QuitSceneButton" class="button UseCaseButton" />
     </ui:VisualElement>
 </ui:UXML>
diff --git a/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasePanelSettings.asset b/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasePanelSettings.asset
index 441819196..f3bff100d 100644
--- a/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasePanelSettings.asset	
+++ b/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasePanelSettings.asset	
@@ -17,14 +17,14 @@ MonoBehaviour:
   m_TargetTexture: {fileID: 0}
   m_RenderMode: 0
   m_WorldSpaceLayer: 0
-  m_ScaleMode: 0
+  m_ScaleMode: 2
   m_ReferenceSpritePixelsPerUnit: 100
   m_PixelsPerUnit: 100
   m_Scale: 1
   m_ReferenceDpi: 96
   m_FallbackDpi: 96
-  m_ReferenceResolution: {x: 1200, y: 800}
-  m_ScreenMatchMode: 0
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 2
   m_Match: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
diff --git a/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasesStyleClass.uss b/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasesStyleClass.uss
index 00aee1ccc..2e0e93ce4 100644
--- a/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasesStyleClass.uss	
+++ b/Basic/MultiplayerUseCases/Assets/UI Toolkit/UseCasesStyleClass.uss	
@@ -1,10 +1,21 @@
+* {
+    --font-size: 16px;
+    --text-color: rgb(250, 250, 250);
+    --mid-blue-color: rgb(79, 120, 168);
+    --mid-blue-color: rgb(79, 120, 168);
+    --dark-blue-color: rgb(47, 79, 112);
+    --light-blue-color: rgb(127, 179, 224);
+    --highlight-color: rgb(76, 178, 113);
+    --highlight-border-color: rgb(166, 243, 185);
+}
+
 .UseCaseButton {
-    background-color: rgb(79, 120, 168);
-    border-color: rgb(127, 179, 224);
+    background-color: var(--mid-blue-color);
+    border-color: var(--light-blue-color);
     border-width: 2px;
-    color: rgb(255, 255, 255);
+    color: var(--text-color);
     -unity-font: url("project://database/Assets/TextMesh%20Pro/Fonts/LiberationSans.ttf?fileID=12800000&guid=e3265ab4bf004d28a9537516768c1c75&type=3#LiberationSans");
-    font-size: 12px;
+    font-size: var(--font-size);
     border-radius: 5px;
     margin: 4px;
     padding: 10px;
@@ -12,60 +23,41 @@
     align-self: center;
     justify-content: flex-start;
     align-items: stretch;
-    -unity-font-definition: none;
-    height: 24px;
     max-height: 24px;
     min-height: 24px;
 }
 
+.UseCaseButton:disabled {
+    background-color: var(--dark-blue-color);
+    border-color: var(--light-blue-color);
+}
+
 .UseCaseButton:hover {
-    background-color: rgb(101, 151, 210);
+    border-color: var(--light-blue-color);
 }
 
-.UseCaseButton:disabled {
-    background-color: rgb(47, 79, 112);
-    border-color: rgb(81, 121, 164);
+.UseCaseButton:focus {
+    border-color: var(--highlight-border-color);
 }
 
 .UseCaseButtonHighlight {
-    background-color: rgb(76, 178, 113);
-    border-color: rgb(96, 225, 141);
-    border-width: 2px;
-    color: rgb(255, 255, 255);
-    -unity-font: url("project://database/Assets/TextMesh%20Pro/Fonts/LiberationSans.ttf?fileID=12800000&guid=e3265ab4bf004d28a9537516768c1c75&type=3#LiberationSans");
-    -unity-font-style: normal;
-    font-size: 12px;
-    border-radius: 5px;
-    margin: 4px;
-    display: flex;
-    opacity: 1;
-    visibility: visible;
-    overflow: visible;
-    -unity-text-outline-width: 0;
-    -unity-text-outline-color: rgba(255, 255, 255, 0);
-    text-overflow: clip;
-    white-space: nowrap;
-    padding: 10px;
-    width: 100%;
-    height: 24px;
-    flex-direction: column;
-    align-self: center;
-    justify-content: flex-start;
-    align-items: stretch;
-    -unity-font-definition: none;
-    max-height: 24px;
-    min-height: 24px;
+    background-color: var(--highlight-color);
+    border-color: var(--highlight-border-color);
+}
+
+.UseCaseButtonHighlight:disabled {
+    background-color: var(--highlight-color);
+    border-color: var(--highlight-border-color);
 }
 
 .unity-text-field {
     margin: 0 0 2px;
-    padding: 2px;
-    font-size: 12px;
+    font-size: var(--font-size);
     width: 100%;
     height: 25px;
     -unity-text-align: middle-center;
     flex-direction: row;
-    border-color: rgb(127, 179, 224);
+    border-color: var(--light-blue-color);
     -unity-font: url("project://database/Assets/TextMesh%20Pro/Fonts/LiberationSans.ttf?fileID=12800000&guid=e3265ab4bf004d28a9537516768c1c75&type=3#LiberationSans");
     align-self: center;
 }
@@ -79,9 +71,16 @@
     border-width: 2px;
     align-self: center;
     max-width: 245px;
-    -unity-font-definition: none;
     border-color: rgb(127, 179, 224);
-    font-size: 12px;
+    font-size: var(--font-size);
+}
+
+.unity-text-field:focus {
+    border-color: var(--highlight-border-color);
+}
+
+.unity-text-field:focus .unity-text-field__input {
+    border-color: var(--highlight-border-color);
 }
 
 .labelText {
@@ -89,8 +88,23 @@
     margin: 2px;
     flex-direction: row;
     -unity-text-align: upper-center;
-    color: rgb(255, 255, 255);
+    color: var(--text-color);
     -unity-font: url("project://database/Assets/TextMesh%20Pro/Fonts/LiberationSans.ttf?fileID=12800000&guid=e3265ab4bf004d28a9537516768c1c75&type=3#LiberationSans");
     -unity-font-style: normal;
-    font-size: 12px;
+    font-size: var(--font-size);
+}
+
+#NetworkManagerUI {
+    position: absolute;
+    background-color: rgb(40, 40, 42);
+    max-width: 200px;
+    min-width: 100px;
+    display: flex;
+    border-bottom-left-radius: 7px;
+    right: 0;
+    justify-content: center;
+    width: 25%;
+    margin: 0px;
+    padding: 12px;
+    top: 0;
 }