From f42ef4e8196cf51b47e3ceaefae01732308aa71e Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Mon, 16 Jun 2025 16:23:09 +0200
Subject: [PATCH 01/12] chore: Shore up the admin extension

---
 .../Editor UI/LootLockerAdminExtension.cs     | 361 +++++++++---------
 1 file changed, 175 insertions(+), 186 deletions(-)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs
index c258bd70..442c0737 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
@@ -127,182 +127,171 @@ public void CreateGUI()
             var styleLength = new StyleLength();
             var current = styleLength.value;
             current.unit = LengthUnit.Percent;
-
             current.value = 100;
-
             labelFromUXML.style.height = current;
-
             root.Add(labelFromUXML);
 
+            var securityWarning = new Label("Warning: Admin tokens are stored in EditorPrefs and are not encrypted. Do not use on shared or insecure machines.");
+            securityWarning.style.color = new StyleColor(Color.yellow);
+            securityWarning.style.unityFontStyleAndWeight = FontStyle.Bold;
+            root.Add(securityWarning);
+
             live.value = new Color(0.749f, 0.325f, 0.098f, 1);
             stage.value = new Color(0.094f, 0.749f, 0.352f, 1);
             defaultButton.value = new Color(0.345f, 0.345f, 0.345f, 1);
 
+            // Null checks for all Q<T>() calls
             menuLogoutBtn = root.Q<Button>("LogoutBtn");
-
-            menuLogoutBtn.style.display = DisplayStyle.None;
+            if (menuLogoutBtn == null) Debug.LogWarning("LogoutBtn not found in UXML");
+            else menuLogoutBtn.style.display = DisplayStyle.None;
 
             environmentBackground = root.Q<VisualElement>("SwitchBackground");
-
-            environmentBackground.AddManipulator(new Clickable(evt => SwapEnvironment()));
+            if (environmentBackground == null) Debug.LogWarning("SwitchBackground not found in UXML");
+            else environmentBackground.AddManipulator(new Clickable(evt => SwapEnvironment()));
 
             environmentHandle = root.Q<VisualElement>("Handle");
+            if (environmentHandle == null) Debug.LogWarning("Handle not found in UXML");
+            else environmentHandle.AddManipulator(new Clickable(evt => SwapEnvironment()));
 
-            environmentHandle.AddManipulator(new Clickable(evt => SwapEnvironment()));
-
-            environmentBackground.tooltip = "Stage";
+            // environmentBackground?.SetTooltip("Stage");
+            if (environmentBackground != null) environmentBackground.tooltip = "Stage";
 
             environmentElement = root.Q<VisualElement>("Environment");
-
-            environmentElement.style.display = DisplayStyle.None;
+            if (environmentElement == null) Debug.LogWarning("Environment not found in UXML");
+            else environmentElement.style.display = DisplayStyle.None;
 
             environmentTitle = root.Q<Label>("EnvironmentTitle");
+            if (environmentTitle == null) Debug.LogWarning("EnvironmentTitle not found in UXML");
 
             gameName = root.Q<Label>("GameName");
+            if (gameName == null) Debug.LogWarning("GameName not found in UXML");
 
             menu = root.Q<VisualElement>("MenuBar");
-
-            menu.style.display = DisplayStyle.None;
+            if (menu == null) Debug.LogWarning("MenuBar not found in UXML");
+            else menu.style.display = DisplayStyle.None;
 
             menuChangeGameBtn = root.Q<Button>("ChangeGameBtn");
+            if (menuChangeGameBtn == null) Debug.LogWarning("ChangeGameBtn not found in UXML");
 
             menuAPIKeyBtn = root.Q<Button>("APIKeyBtn");
+            if (menuAPIKeyBtn == null) Debug.LogWarning("APIKeyBtn not found in UXML");
 
             menuLogoutBtn = root.Q<Button>("LogoutBtn");
+            if (menuLogoutBtn != null)
+                menuLogoutBtn.clickable.clicked += () => { ConfirmLogout(); };
 
-            menuLogoutBtn.clickable.clicked += () =>
-            {
-                Logout();
-            };
-
-            menuChangeGameBtn.clickable.clicked += () =>
-            {
-                SwapFlows(gameSelectorFlow);
-            };
+            // menuChangeGameBtn?.clickable.clicked += () => { SwapFlows(gameSelectorFlow); };
+            if (menuChangeGameBtn != null) menuChangeGameBtn.clickable.clicked += () => { SwapFlows(gameSelectorFlow); };
 
             popup = root.Q<VisualElement>("PopUp");
+            if (popup == null) Debug.LogWarning("PopUp not found in UXML");
 
             popupTitle = root.Q<Label>("popupTitle");
             popupMessage = root.Q<Label>("popupMessage");
-
             popupBtn = root.Q<Button>("popupCloseBtn");
-
-            popupBtn.clickable.clickedWithEventInfo += ClosePopup;
+            if (popupBtn != null) popupBtn.clickable.clickedWithEventInfo += ClosePopup;
 
             loginFlow = root.Q<VisualElement>("LoginFlow");
-
-            loginFlow.style.display = DisplayStyle.None;
+            if (loginFlow == null) Debug.LogWarning("LoginFlow not found in UXML");
+            else loginFlow.style.display = DisplayStyle.None;
 
             emailField = root.Q<TextField>("EmailField");
             passwordField = root.Q<TextField>("PasswordField");
-
-            passwordField.RegisterCallback<KeyDownEvent>((evt) =>
+            if (passwordField != null)
             {
-                if (evt.keyCode == KeyCode.Return)
+                passwordField.RegisterCallback<KeyDownEvent>((evt) =>
                 {
-                    Login();
-                }
-            });
+                    if (evt.keyCode == KeyCode.Return)
+                    {
+                        Login();
+                    }
+                });
+            }
 
             signupLink = root.Q<Label>("newUserLink");
             gettingStartedLink = root.Q<Label>("gettingStartedLink");
             forgotPasswordLink = root.Q<Label>("forgotPasswordLink");
-
             loginBtn = root.Q<Button>("LoginBtn");
-
-            signupLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://lootlocker.com/sign-up"));
-            forgotPasswordLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://console.lootlocker.com/forgot-password"));
-            gettingStartedLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://docs.lootlocker.com/the-basics/readme"));
-
-            loginBtn.clickable.clicked += Login;
+            if (signupLink != null) signupLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://lootlocker.com/sign-up"));
+            if (forgotPasswordLink != null) forgotPasswordLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://console.lootlocker.com/forgot-password"));
+            if (gettingStartedLink != null) gettingStartedLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://docs.lootlocker.com/the-basics/readme"));
+            if (loginBtn != null) loginBtn.clickable.clicked += Login;
 
             mfaFlow = root.Q<VisualElement>("MFAFlow");
-
             codeField = root.Q<TextField>("CodeField");
-
             signInBtn = root.Q<Button>("SignInBtn");
-
-            signInBtn.clickable.clickedWithEventInfo += SignIn;
-
-            mfaFlow.style.display = DisplayStyle.None;
+            if (signInBtn != null) signInBtn.clickable.clickedWithEventInfo += SignIn;
+            if (mfaFlow != null) mfaFlow.style.display = DisplayStyle.None;
 
             gameSelectorFlow = root.Q<VisualElement>("GameSelectorFlow");
-
             gameSelectorList = root.Q<VisualElement>("GamesList");
-
-            gameSelectorFlow.style.display = DisplayStyle.None;
+            if (gameSelectorFlow != null) gameSelectorFlow.style.display = DisplayStyle.None;
 
             apiKeyFlow = root.Q<VisualElement>("APIKeyFlow");
-
-            apiKeyFlow.style.display = DisplayStyle.None;
+            if (apiKeyFlow != null) apiKeyFlow.style.display = DisplayStyle.None;
 
             createApiKeyWindow = root.Q<VisualElement>("InfoandCreate");
-
-            createApiKeyWindow.style.display = DisplayStyle.None;
+            if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
 
             apiKeyList = root.Q<VisualElement>("APIKeyList");
-
             newApiKeyWindow = root.Q<VisualElement>("CreateAPIKeyWindow");
-
             newApiKeyName = root.Q<TextField>("newApiKeyName");
-
             newApiKeyCancel = root.Q<Label>("APINewKeyCancel");
-
-            newApiKeyCancel.RegisterCallback<MouseDownEvent>(_ =>
-            {
-                newApiKeyName.value = "";
-                newApiKeyWindow.style.display = DisplayStyle.None;
-
-            });
+            if (newApiKeyCancel != null)
+                newApiKeyCancel.RegisterCallback<MouseDownEvent>(_ =>
+                {
+                    if (newApiKeyName != null) newApiKeyName.value = "";
+                    if (newApiKeyWindow != null) newApiKeyWindow.style.display = DisplayStyle.None;
+                });
 
             createApiKeyBtn = root.Q<Button>("CreateNewKey");
-
-            createApiKeyBtn.clickable.clicked += () =>
-            {
-                CreateNewAPIKey();
-                newApiKeyWindow.style.display = DisplayStyle.None;
-            };
+            if (createApiKeyBtn != null)
+                createApiKeyBtn.clickable.clicked += () =>
+                {
+                    CreateNewAPIKey();
+                    if (newApiKeyWindow != null) newApiKeyWindow.style.display = DisplayStyle.None;
+                };
 
             createNewApiKeyBtn = root.Q<Button>("CreateKeyBtn");
-
-            createNewApiKeyBtn.clickable.clicked += () =>
-            {
-                newApiKeyWindow.style.display = DisplayStyle.Flex;
-            };
+            if (createNewApiKeyBtn != null)
+                createNewApiKeyBtn.clickable.clicked += () =>
+                {
+                    if (newApiKeyWindow != null) newApiKeyWindow.style.display = DisplayStyle.Flex;
+                };
 
             isStage = LootLockerEditorData.IsEnvironmentStage();
-
             if (isStage)
             {
-                environmentHandle.style.alignSelf = Align.FlexStart;
-                environmentBackground.style.backgroundColor = stage;
-                environmentTitle.text = "Environment: Stage";
+                if (environmentHandle != null) environmentHandle.style.alignSelf = Align.FlexStart;
+                if (environmentBackground != null) environmentBackground.style.backgroundColor = stage;
+                if (environmentTitle != null) environmentTitle.text = "Environment: Stage";
             }
             else
             {
-                environmentHandle.style.alignSelf = Align.FlexEnd;
-                environmentBackground.style.backgroundColor = live;
-                environmentTitle.text = "Environment: Live";
+                if (environmentHandle != null) environmentHandle.style.alignSelf = Align.FlexEnd;
+                if (environmentBackground != null) environmentBackground.style.backgroundColor = live;
+                if (environmentTitle != null) environmentTitle.text = "Environment: Live";
             }
 
             loadingPage = root.Q<VisualElement>("LoadingBackground");
-            loadingPage.style.display = DisplayStyle.Flex;
+            if (loadingPage != null) loadingPage.style.display = DisplayStyle.Flex;
             currentFlow = loadingPage;
 
             loadingIcon = root.Q<VisualElement>("LoadingIcon");
-
-            loadingIcon.schedule.Execute(() =>
+            if (loadingIcon != null)
             {
-                if (rotateIndex >= 360)
+                loadingIcon.schedule.Execute(() =>
                 {
-                    rotateIndex = 0;
-                }
-                rotateIndex += 1;
-                EditorApplication.update += OnEditorUpdate;
-                loadingIcon.style.rotate = new StyleRotate(new Rotate(new Angle(rotateIndex, AngleUnit.Degree)));
-                EditorApplication.update -= OnEditorUpdate;
-
-            }).Every(1);
+                    if (rotateIndex >= 360)
+                    {
+                        rotateIndex = 0;
+                    }
+                    rotateIndex += 1;
+                    EditorApplication.update += OnEditorUpdate;
+                    loadingIcon.style.rotate = new StyleRotate(new Rotate(new Angle(rotateIndex, AngleUnit.Degree)));
+                    EditorApplication.update -= OnEditorUpdate;
+                }).Every(16); // 60 FPS
+            }
 
             Run();
         }
@@ -339,70 +328,55 @@ void SwapEnvironment()
         void SwapFlows(VisualElement New)
         {
             if (currentFlow == New) return;
-
             activeFlow = New;
-
             if (currentFlow != null)
             {
                 currentFlow.style.display = DisplayStyle.None;
                 if (currentFlow == apiKeyFlow)
                 {
-                    apiKeyList.Clear();
+                    apiKeyList?.Clear();
                 }
             }
-
             New.style.display = DisplayStyle.Flex;
-
             if (activeFlow == gameSelectorFlow)
             {
-                gameName.text = "LootLocker";
-                emailField.value = "hector@lootlocker.com";
-                passwordField.value = "its my password!";
-                menuAPIKeyBtn.style.display = DisplayStyle.None;
-                menuChangeGameBtn.style.display = DisplayStyle.None;
-                environmentElement.style.display = DisplayStyle.None;
-                createApiKeyWindow.style.display = DisplayStyle.None;
-                menu.style.display = DisplayStyle.Flex;
-                menuLogoutBtn.style.display = DisplayStyle.Flex;
-                menuAPIKeyBtn.style.display = DisplayStyle.None;
-                menuChangeGameBtn.style.display = DisplayStyle.None;
-
+                if (gameName != null) gameName.text = "LootLocker";
+                // Remove hardcoded credentials
+                if (emailField != null) emailField.value = "";
+                if (passwordField != null) passwordField.value = "";
+                SetMenuVisibility(apiKey: false, changeGame: false, logout: true);
+                if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
+                if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
                 CreateGameButtons();
             }
-
             if (activeFlow == apiKeyFlow)
             {
-                gameName.text = LootLockerEditorData.GetSelectedGameName();
-                menu.style.display = DisplayStyle.Flex;
-                menuAPIKeyBtn.style.display = DisplayStyle.Flex;
-                menuChangeGameBtn.style.display = DisplayStyle.Flex;
-                environmentElement.style.display = DisplayStyle.Flex;
-                createApiKeyWindow.style.display = DisplayStyle.Flex;
-                menuLogoutBtn.style.display = DisplayStyle.Flex;
-                menuAPIKeyBtn.style.display = DisplayStyle.Flex;
-                menuChangeGameBtn.style.display = DisplayStyle.Flex;
-
+                if (gameName != null) gameName.text = LootLockerEditorData.GetSelectedGameName();
+                SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
+                if (environmentElement != null) environmentElement.style.display = DisplayStyle.Flex;
+                if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.Flex;
                 RefreshAPIKeys();
             }
-
             if (activeFlow == loginFlow)
             {
-                environmentElement.style.display = DisplayStyle.None;
-                menu.style.display = DisplayStyle.None;
-                createApiKeyWindow.style.display = DisplayStyle.None;
-
+                if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
+                if (menu != null) menu.style.display = DisplayStyle.None;
+                if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
             }
-
             if (activeFlow == mfaFlow)
             {
-                menu.style.display = DisplayStyle.Flex;
-                menuLogoutBtn.style.display = DisplayStyle.Flex;
-                menuAPIKeyBtn.style.display = DisplayStyle.None;
-                menuChangeGameBtn.style.display = DisplayStyle.None;
+                SetMenuVisibility(apiKey: false, changeGame: false, logout: true);
             }
-
             currentFlow = New;
         }
+        // Helper for menu visibility
+        void SetMenuVisibility(bool apiKey, bool changeGame, bool logout)
+        {
+            if (menu != null) menu.style.display = DisplayStyle.Flex;
+            if (menuAPIKeyBtn != null) menuAPIKeyBtn.style.display = apiKey ? DisplayStyle.Flex : DisplayStyle.None;
+            if (menuChangeGameBtn != null) menuChangeGameBtn.style.display = changeGame ? DisplayStyle.Flex : DisplayStyle.None;
+            if (menuLogoutBtn != null) menuLogoutBtn.style.display = logout ? DisplayStyle.Flex : DisplayStyle.None;
+        }
 
         private void OnEditorUpdate()
         {
@@ -424,44 +398,49 @@ private void ClosePopup(EventBase e)
 
         public void Login()
         {
-            if (string.IsNullOrEmpty(emailField.value) || string.IsNullOrEmpty(passwordField.value))
+            if (string.IsNullOrEmpty(emailField?.value) || string.IsNullOrEmpty(passwordField?.value))
             {
                 ShowPopup("Error", "Email or Password is empty.");
-                loadingPage.style.display = DisplayStyle.None;
+                if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
                 return;
             }
-
             EditorApplication.update += OnEditorUpdate;
-            loadingPage.style.display = DisplayStyle.Flex;
-
-            LootLockerAdminManager.AdminLogin(emailField.value, passwordField.value, (onComplete) =>
+            if (loadingPage != null) loadingPage.style.display = DisplayStyle.Flex;
+            try
             {
-                if (!onComplete.success)
+                LootLockerAdminManager.AdminLogin(emailField.value, passwordField.value, (onComplete) =>
                 {
-                    ShowPopup("Error", "We couldn't recognize your information or there is no user with this email, please check and try again!");
-                    loadingPage.style.display = DisplayStyle.None;
-                    return;
-                }
-
-                if (onComplete.mfa_key != null)
-                {
-                    mfaKey = onComplete.mfa_key;
-                    menu.style.display = DisplayStyle.Flex;
-                    loadingPage.style.display = DisplayStyle.None;
-                    SwapFlows(mfaFlow);
-                }
-                else
-                {
-                    menu.style.display = DisplayStyle.Flex;
-                    LootLockerConfig.current.adminToken = onComplete.auth_token;
-                    LootLockerEditorData.SetAdminToken(onComplete.auth_token);
-                    loadingPage.style.display = DisplayStyle.None;
-
-                    SwapFlows(gameSelectorFlow);
-                }
-                menuLogoutBtn.style.display = DisplayStyle.Flex;
-                EditorApplication.update -= OnEditorUpdate;
-            });
+                    if (!onComplete.success)
+                    {
+                        string errorMsg = !string.IsNullOrEmpty(onComplete.errorData?.message) ? onComplete.errorData.message : "We couldn't recognize your information or there is no user with this email, please check and try again!";
+                        ShowPopup("Error", errorMsg);
+                        if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
+                        return;
+                    }
+                    if (onComplete.mfa_key != null)
+                    {
+                        mfaKey = onComplete.mfa_key;
+                        if (menu != null) menu.style.display = DisplayStyle.Flex;
+                        if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
+                        SwapFlows(mfaFlow);
+                    }
+                    else
+                    {
+                        if (menu != null) menu.style.display = DisplayStyle.Flex;
+                        LootLockerConfig.current.adminToken = onComplete.auth_token;
+                        LootLockerEditorData.SetAdminToken(onComplete.auth_token);
+                        if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
+                        SwapFlows(gameSelectorFlow);
+                    }
+                    if (menuLogoutBtn != null) menuLogoutBtn.style.display = DisplayStyle.Flex;
+                    EditorApplication.update -= OnEditorUpdate;
+                });
+            }
+            catch (Exception ex)
+            {
+                ShowPopup("Error", $"Unexpected error: {ex.Message}");
+                if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
+            }
         }
 
         public void SignIn(EventBase e)
@@ -696,10 +675,8 @@ void RefreshAPIKeys()
         void APIKeyTemplate(KeyResponse key)
         {
             Button button = new Button();
-
             bool isLegacyKey = !(key.api_key.StartsWith("prod_") || key.api_key.StartsWith("dev_"));
             button.name = key.api_key;
-
             Label keyName = new Label();
             keyName.text = key.name;
             if (string.IsNullOrEmpty(key.name))
@@ -709,8 +686,8 @@ void APIKeyTemplate(KeyResponse key)
             if (button.name == LootLockerConfig.current.apiKey)
             {
                 button.style.borderRightColor = button.style.borderLeftColor = button.style.borderTopColor = button.style.borderBottomColor = stage;
+                button.style.backgroundColor = new StyleColor(new Color(0.2f, 0.5f, 0.2f, 1f)); // Feedback highlight
             }
-
             if (isLegacyKey)
             {
                 keyName.text = "Legacy key: " + keyName.text;
@@ -720,19 +697,14 @@ void APIKeyTemplate(KeyResponse key)
             {
                 button.AddToClassList("apikey");
             }
-
-
             keyName.AddToClassList("apikeyName");
-
-
             button.Add(keyName);
-
             if (!isLegacyKey)
             {
                 button.clickable.clickedWithEventInfo += OnAPIKeySelected;
+                button.tooltip = "Click to select this API key.";
             }
-
-            apiKeyList.Add(button);
+            apiKeyList?.Add(button);
         }
 
         void OnAPIKeySelected(EventBase e)
@@ -745,23 +717,20 @@ void OnAPIKeySelected(EventBase e)
             LootLockerConfig.current.apiKey = target.name;
 
             SwapNewSelectedKey();
+            ShowPopup("API Key Selected", $"API Key {target.name} is now active."); // Feedback
         }
 
-        void SwapNewSelectedKey()
+        void ConfirmLogout()
         {
-            foreach (var element in apiKeyList.Children())
+            ShowPopup("Confirm Logout", "Are you sure you want to log out? This will clear your admin token and settings.");
+            if (popupBtn != null)
             {
-
-                var key = element as Button;
-
-                if (key.name == LootLockerConfig.current.apiKey)
+                popupBtn.clickable.clickedWithEventInfo -= ClosePopup;
+                popupBtn.clickable.clickedWithEventInfo += (evt) =>
                 {
-                    key.style.borderRightColor = key.style.borderLeftColor = key.style.borderTopColor = key.style.borderBottomColor = stage;
-                }
-                else
-                {
-                    key.style.backgroundColor = defaultButton;
-                }
+                    Logout();
+                    ClosePopup(evt);
+                };
             }
         }
 
@@ -782,6 +751,26 @@ private void OnDestroy()
             LootLockerHTTPClient.ResetInstance();
         }
 
+        void SwapNewSelectedKey()
+        {
+            if (apiKeyList == null) return;
+            foreach (var element in apiKeyList.Children())
+            {
+                var key = element as Button;
+                if (key == null) continue;
+                if (key.name == LootLockerConfig.current.apiKey)
+                {
+                    key.style.borderRightColor = key.style.borderLeftColor = key.style.borderTopColor = key.style.borderBottomColor = stage;
+                    key.style.backgroundColor = new StyleColor(new Color(0.2f, 0.5f, 0.2f, 1f)); // Feedback highlight
+                }
+                else
+                {
+                    key.style.backgroundColor = defaultButton;
+                    key.style.borderRightColor = key.style.borderLeftColor = key.style.borderTopColor = key.style.borderBottomColor = defaultButton;
+                }
+            }
+        }
+
     }
 }
 #endif
\ No newline at end of file

From 1c7fcb6102e8f8644cd1a90f234e98fc5a294d7d Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Tue, 17 Jun 2025 08:14:31 +0200
Subject: [PATCH 02/12] fix: Only show environment switcher for games that have
 environments

---
 .../Editor UI/LootLockerAdminExtension.cs     | 48 ++++++++++++++++---
 .../Editor/LootLockerExtensionResponses.cs    | 17 ++++++-
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs
index 442c0737..9c000e6d 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
@@ -76,6 +76,8 @@ public class LootLockerAdminExtension : EditorWindow
         VisualElement loadingIcon;
         int rotateIndex = 0;
 
+        private Label securityWarning;
+
         [MenuItem("Window/LootLocker")]
         public static void Run()
         {
@@ -131,9 +133,10 @@ public void CreateGUI()
             labelFromUXML.style.height = current;
             root.Add(labelFromUXML);
 
-            var securityWarning = new Label("Warning: Admin tokens are stored in EditorPrefs and are not encrypted. Do not use on shared or insecure machines.");
+            securityWarning = new Label("Warning: Do not use on shared or insecure machines, data is stored in EditorPrefs");
             securityWarning.style.color = new StyleColor(Color.yellow);
             securityWarning.style.unityFontStyleAndWeight = FontStyle.Bold;
+            securityWarning.style.display = DisplayStyle.None; // Hide by default
             root.Add(securityWarning);
 
             live.value = new Color(0.749f, 0.325f, 0.098f, 1);
@@ -296,6 +299,16 @@ public void CreateGUI()
             Run();
         }
 
+        private bool IsStageOnlyGame()
+        {
+            int selectedGameId = LootLockerEditorData.GetSelectedGame();
+            if (!gameData.ContainsKey(selectedGameId)) return false;
+            var game = gameData[selectedGameId];
+            if (game.created_at == default(System.DateTime) || game.created_at == null) return false;
+            var cutoff = new System.DateTime(2025, 3, 10);
+            return game.created_at < cutoff;
+        }
+
         void SwapEnvironment()
         {
             if (isLoadingKeys)
@@ -338,6 +351,8 @@ void SwapFlows(VisualElement New)
                 }
             }
             New.style.display = DisplayStyle.Flex;
+            if (securityWarning != null) securityWarning.style.display = DisplayStyle.None;
+            
             if (activeFlow == gameSelectorFlow)
             {
                 if (gameName != null) gameName.text = "LootLocker";
@@ -353,8 +368,20 @@ void SwapFlows(VisualElement New)
             {
                 if (gameName != null) gameName.text = LootLockerEditorData.GetSelectedGameName();
                 SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
-                if (environmentElement != null) environmentElement.style.display = DisplayStyle.Flex;
                 if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.Flex;
+                if (environmentElement != null && environmentBackground != null && environmentHandle != null && environmentTitle != null)
+                {
+                    if (IsStageOnlyGame())
+                    {
+                        environmentElement.style.display = DisplayStyle.Flex;
+                        environmentBackground.style.display = DisplayStyle.Flex;
+                        environmentHandle.style.display = DisplayStyle.Flex;
+                    }
+                    else
+                    {
+                        environmentElement.style.display = DisplayStyle.None;
+                    }
+                }
                 RefreshAPIKeys();
             }
             if (activeFlow == loginFlow)
@@ -362,6 +389,7 @@ void SwapFlows(VisualElement New)
                 if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
                 if (menu != null) menu.style.display = DisplayStyle.None;
                 if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
+                if (securityWarning != null) securityWarning.style.display = DisplayStyle.Flex;
             }
             if (activeFlow == mfaFlow)
             {
@@ -581,8 +609,13 @@ void OnGameSelected(EventBase e)
             var target = e.target as Button;
 
             LootLockerEditorData.SetSelectedGame(target.name);
+            var selectedGameData = gameData[int.Parse(target.name)];
+
+            LootLockerEditorData.SetSelectedGameName(selectedGameData.name);
+            gameName.text = selectedGameData.name;
 
-            gameName.text = gameData[int.Parse(target.name)].name;
+            LootLockerEditorData.SetEnvironmentStage();
+            isStage = true;
 
             EditorApplication.update += OnEditorUpdate;
 
@@ -598,15 +631,12 @@ void OnGameSelected(EventBase e)
                 EditorApplication.update -= OnEditorUpdate;
             });
 
-
-
             SwapFlows(apiKeyFlow);
         }
 
         void CreateNewAPIKey()
         {
             int gameId = LootLockerEditorData.GetSelectedGame();
-
             if (gameId == 0)
             {
                 ShowPopup("Error", "No active Game found!");
@@ -644,7 +674,11 @@ void CreateNewAPIKey()
         void RefreshAPIKeys()
         {
             apiKeyList.Clear();
-            int gameID = isStage ? gameData[LootLockerEditorData.GetSelectedGame()].development.id : LootLockerEditorData.GetSelectedGame();
+            int gameID = LootLockerEditorData.GetSelectedGame();
+            if (isStage)
+            {
+                gameID = gameData[gameID].development.id;
+            }
             isLoadingKeys = true;
 
             EditorApplication.update += OnEditorUpdate;
diff --git a/Runtime/Editor/LootLockerExtensionResponses.cs b/Runtime/Editor/LootLockerExtensionResponses.cs
index 3c1f2ec2..5523921e 100644
--- a/Runtime/Editor/LootLockerExtensionResponses.cs
+++ b/Runtime/Editor/LootLockerExtensionResponses.cs
@@ -29,7 +29,11 @@ namespace LootLocker.Extension.DataTypes
     public class Game
     {
         public int id { get; set; }
+        public string title_id { get; set; }
+        public string environment_id { get; set; }
+        public System.DateTime created_at { get; set; }
         public bool is_demo { get; set; }
+        public string trial_end_date { get; set; }
         public string name { get; set; }
         public string badge_url { get; set; }
         public string logo_url { get; set; }
@@ -40,7 +44,14 @@ public class Game
     public class DevelopmentGame
     {
         public int id { get; set; }
-
+        public string title_id { get; set; }
+        public string environment_id { get; set; }
+        public System.DateTime created_at { get; set; }
+        public bool is_demo { get; set; }
+        public string trial_end_date { get; set; }
+        public string name { get; set; }
+        public string badge_url { get; set; }
+        public string logo_url { get; set; }
     }
 
     public class Organisation
@@ -48,6 +59,8 @@ public class Organisation
         public int id { get; set; }
         public string name { get; set; }
         public Game[] games { get; set; }
+        public string finalized_signup_at { get; set; }
+        public bool subscribed { get; set; }
 
         public Game GetGameByID(int id)
         {
@@ -66,7 +79,9 @@ public class User
     {
         public int id { get; set; }
         public string name { get; set; }
+        public string email { get; set; }
         public long signed_up { get; set; }
+        public bool is_verified { get; set; }
         public Organisation[] organisations { get; set; }
         private Dictionary<int, int> organisationIndexByID { get; set; }
 

From 833358fbd5442a7360c95462cc59b813306a37d1 Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Tue, 17 Jun 2025 09:07:21 +0200
Subject: [PATCH 03/12] feature: Add a trial license expiry warning to admin
 extension

---
 .../Editor UI/LootLockerAdminExtension.cs     | 105 ++++++++++++++++++
 .../Editor UI/LootLockerAdminExtension.uss    |  22 ++++
 .../Editor UI/LootLockerAdminExtension.uxml   |   4 +
 3 files changed, 131 insertions(+)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs
index 9c000e6d..eb3ecb6d 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
@@ -78,6 +78,11 @@ public class LootLockerAdminExtension : EditorWindow
 
         private Label securityWarning;
 
+        // License Countdown UI
+        private VisualElement licenseCountdownContainer;
+        private Label licenseCountdownLabel;
+        private Image licenseCountdownIcon;
+
         [MenuItem("Window/LootLocker")]
         public static void Run()
         {
@@ -296,6 +301,12 @@ public void CreateGUI()
                 }).Every(16); // 60 FPS
             }
 
+            // License Countdown UI
+            licenseCountdownContainer = root.Q<VisualElement>("LicenseCountdownContainer");
+            licenseCountdownLabel = root.Q<Label>("LicenseCountdownLabel");
+            licenseCountdownIcon = root.Q<Image>("LicenseCountdownIcon");
+            if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
+
             Run();
         }
 
@@ -355,6 +366,7 @@ void SwapFlows(VisualElement New)
             
             if (activeFlow == gameSelectorFlow)
             {
+                if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
                 if (gameName != null) gameName.text = "LootLocker";
                 // Remove hardcoded credentials
                 if (emailField != null) emailField.value = "";
@@ -367,6 +379,7 @@ void SwapFlows(VisualElement New)
             if (activeFlow == apiKeyFlow)
             {
                 if (gameName != null) gameName.text = LootLockerEditorData.GetSelectedGameName();
+                UpdateLicenseCountdownUI();
                 SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
                 if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.Flex;
                 if (environmentElement != null && environmentBackground != null && environmentHandle != null && environmentTitle != null)
@@ -386,6 +399,7 @@ void SwapFlows(VisualElement New)
             }
             if (activeFlow == loginFlow)
             {
+                if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
                 if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
                 if (menu != null) menu.style.display = DisplayStyle.None;
                 if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
@@ -524,6 +538,7 @@ public void RefreshUserInformation(Action onComplete)
                         gameData.Add(game.id, game);
                     }
                 }
+                UpdateLicenseCountdownUI();
 
                 gameDataRefreshTime = DateTime.Now;
 
@@ -613,6 +628,7 @@ void OnGameSelected(EventBase e)
 
             LootLockerEditorData.SetSelectedGameName(selectedGameData.name);
             gameName.text = selectedGameData.name;
+            UpdateLicenseCountdownUI();
 
             LootLockerEditorData.SetEnvironmentStage();
             isStage = true;
@@ -805,6 +821,95 @@ void SwapNewSelectedKey()
             }
         }
 
+        // Call this whenever the selected game changes or flows swap to APIKeyFlow
+        private void UpdateLicenseCountdownUI()
+        {
+            if (licenseCountdownContainer == null || licenseCountdownLabel == null || licenseCountdownIcon == null)
+                return;
+
+            int selectedGameId = LootLockerEditorData.GetSelectedGame();
+            if (!gameData.ContainsKey(selectedGameId))
+            {
+                licenseCountdownContainer.style.display = DisplayStyle.None;
+                return;
+            }
+            var game = gameData[selectedGameId];
+            string trialEndDate = game.trial_end_date;
+            if (string.IsNullOrEmpty(trialEndDate))
+            {
+                licenseCountdownContainer.style.display = DisplayStyle.None;
+                return;
+            }
+            if (!System.DateTime.TryParse(trialEndDate, out var endDate))
+            {
+                licenseCountdownContainer.style.display = DisplayStyle.None;
+                return;
+            }
+            var now = System.DateTime.UtcNow;
+            int daysLeft = (endDate.Date - now.Date).Days;
+            if (endDate < now)
+            {
+                // Expired
+                licenseCountdownLabel.text = "Trial Expired";
+                licenseCountdownLabel.RemoveFromClassList("licenseCountdownLabel");
+                licenseCountdownLabel.RemoveFromClassList("expired");
+                licenseCountdownLabel.AddToClassList("licenseCountdownLabel");
+                licenseCountdownLabel.AddToClassList("expired");
+                licenseCountdownLabel.style.color = new Color(1f, 0.31f, 0.31f); // rgb(255,80,80)
+                licenseCountdownLabel.style.display = DisplayStyle.Flex;
+                licenseCountdownIcon.image = EditorGUIUtility.IconContent("console.warnicon").image as Texture2D;
+                licenseCountdownIcon.style.display = DisplayStyle.Flex;
+                licenseCountdownContainer.style.display = DisplayStyle.Flex;
+                licenseCountdownContainer.tooltip = "Click to manage your license";
+                licenseCountdownContainer.RegisterCallback<MouseDownEvent>(LicenseCountdownContainerClick);
+            }
+            else if (daysLeft == 0)
+            {
+                // Trial ends today
+                licenseCountdownLabel.text = "Trial ends today";
+                licenseCountdownLabel.RemoveFromClassList("licenseCountdownLabel");
+                licenseCountdownLabel.RemoveFromClassList("expired");
+                licenseCountdownLabel.AddToClassList("licenseCountdownLabel");
+                licenseCountdownLabel.AddToClassList("expired");
+                licenseCountdownLabel.style.color = new Color(1f, 0.31f, 0.31f); // rgb(255,80,80)
+                licenseCountdownLabel.style.display = DisplayStyle.Flex;
+                licenseCountdownIcon.image = EditorGUIUtility.IconContent("console.warnicon").image as Texture2D;
+                licenseCountdownIcon.style.display = DisplayStyle.Flex;
+                licenseCountdownContainer.style.display = DisplayStyle.Flex;
+                licenseCountdownContainer.tooltip = "Click to manage your license";
+                licenseCountdownContainer.RegisterCallback<MouseDownEvent>(LicenseCountdownContainerClick);
+            }
+            else if (daysLeft > 0 && daysLeft <= 10)
+            {
+                // Not expired, but less than or equal to 10 days left
+                licenseCountdownLabel.text = $"Trial ends in {daysLeft} days";
+                licenseCountdownLabel.RemoveFromClassList("expired");
+                licenseCountdownLabel.AddToClassList("licenseCountdownLabel");
+                licenseCountdownLabel.style.display = DisplayStyle.Flex;
+                licenseCountdownIcon.image = EditorGUIUtility.IconContent("_Help").image as Texture2D;
+                licenseCountdownIcon.style.display = DisplayStyle.Flex;
+                licenseCountdownContainer.style.display = DisplayStyle.Flex;
+                licenseCountdownContainer.tooltip = "Learn more about your license";
+                licenseCountdownContainer.UnregisterCallback<MouseDownEvent>(LicenseCountdownContainerClick);
+                licenseCountdownIcon.RegisterCallback<MouseDownEvent>(LicenseCountdownIconClick);
+            }
+            else
+            {
+                // More than 10 days left, hide
+                licenseCountdownContainer.style.display = DisplayStyle.None;
+            }
+        }
+
+        private void LicenseCountdownIconClick(MouseDownEvent evt)
+        {
+            Application.OpenURL("https://console.lootlocker.com");
+            evt.StopPropagation();
+        }
+        private void LicenseCountdownContainerClick(MouseDownEvent evt)
+        {
+            Application.OpenURL("https://console.lootlocker.com");
+            evt.StopPropagation();
+        }
     }
 }
 #endif
\ No newline at end of file
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uss b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uss
index 3feac430..d43c2f1d 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uss	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uss	
@@ -91,3 +91,25 @@
 
 .menuBtn {
 }
+
+.licenseCountdownLabel {
+    font-size: 14px;
+    color: rgb(255, 200, 0);
+    margin-right: 4px;
+    display: flex;
+    align-items: center;
+}
+.licenseCountdownLabel.expired, .expired.licenseCountdownLabel, .expired {
+    color: rgb(255, 80, 80) !important;
+    -unity-font-style: bold;
+}
+.licenseCountdownLabel.expired:hover, .expired.licenseCountdownLabel:hover, .expired:hover {
+    cursor: link;
+}
+.licenseCountdownIcon {
+    width: 16px;
+    height: 16px;
+    display: flex;
+    cursor: link;
+    margin-left: 2px;
+}
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml
index 539a9d8e..b34d8f71 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml	
@@ -3,6 +3,10 @@
     <ui:VisualElement style="align-self: stretch; justify-content: center; align-items: stretch; height: 100%;">
         <ui:VisualElement name="Topbar" style="flex-grow: 1; visibility: visible; display: flex; border-bottom-width: 2px; border-bottom-color: rgb(46, 46, 46); flex-direction: row; justify-content: flex-start; align-self: auto; align-items: stretch; flex-wrap: wrap;">
             <ui:Label tabindex="-1" text="LootLocker" display-tooltip-when-elided="true" name="GameName" style="align-items: flex-start; align-self: center; font-size: 28px; -unity-text-align: middle-left; text-overflow: clip; width: auto; white-space: nowrap; max-width: 750px; margin-left: 24px; justify-content: flex-start;" />
+            <ui:VisualElement name="LicenseCountdownContainer" style="flex-direction: row; align-items: center; align-self: center; margin-left: 12px;">
+                <ui:Label name="LicenseCountdownLabel" text="" style="font-size: 14px; color: rgb(255, 200, 0); margin-right: 4px; display: none;" />
+                <ui:Image name="LicenseCountdownIcon" style="width: 16px; height: 16px; display: none; cursor: link;" />
+            </ui:VisualElement>
             <ui:VisualElement name="Environment" style="flex-grow: 1; flex-direction: row; flex-shrink: 1; align-self: stretch; justify-content: flex-end; margin-right: 24px;">
                 <ui:Label tabindex="-1" text="Environment: Stage" display-tooltip-when-elided="true" name="EnvironmentTitle" style="align-items: flex-start; align-self: center; font-size: 14px; -unity-text-align: middle-left; text-overflow: clip; white-space: nowrap; margin-right: 8px;" />
                 <ui:VisualElement name="SwitchBackground" class="environmentToStageBackground" style="flex-grow: 1; background-color: rgb(28, 232, 109); min-width: 0; min-height: 26px; border-top-left-radius: 12px; border-top-right-radius: 12px; border-bottom-right-radius: 12px; border-bottom-left-radius: 12px; align-items: auto; align-self: center; max-width: 45px; justify-content: center; flex-shrink: 0;">

From fb722552739a55efdcd3c2dbcba08f15c7dcf4d9 Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Tue, 17 Jun 2025 13:44:14 +0200
Subject: [PATCH 04/12] feat: Add settings menu to admin extension

---
 .../Editor UI/LootLockerAdminExtension.cs     | 175 ++++++++++++++++--
 .../Editor UI/LootLockerAdminExtension.uss    |  11 ++
 .../Editor UI/LootLockerAdminExtension.uxml   |  37 ++--
 Runtime/Editor/LootLockerExtensionCalls.cs    |  57 +++++-
 4 files changed, 243 insertions(+), 37 deletions(-)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs
index eb3ecb6d..ff6b336f 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
@@ -15,10 +15,10 @@ public class LootLockerAdminExtension : EditorWindow
         bool isStage = true;
         bool isLoadingKeys = false;
         Dictionary<int, LootLocker.Extension.DataTypes.Game> gameData = new Dictionary<int, LootLocker.Extension.DataTypes.Game>();
-        private Label gameName;
-        DateTime gameDataRefreshTime;
+        private Label gameName;        DateTime gameDataRefreshTime;
         readonly int gameDataCacheExpirationTimeMinutes = 1;
         private VisualElement currentFlow = null;
+        private VisualElement previousFlow = null; // Track previous flow for back button
 
         [SerializeField]
         private VisualTreeAsset m_VisualTreeAsset = default;
@@ -36,7 +36,7 @@ public class LootLockerAdminExtension : EditorWindow
 
         [Header("Flows")]
         private VisualElement activeFlow;
-        private VisualElement loginFlow, mfaFlow, gameSelectorFlow, apiKeyFlow;
+        private VisualElement loginFlow, mfaFlow, gameSelectorFlow, apiKeyFlow, settingsFlow;
 
         [Header("Menu")]
         private VisualElement menu;
@@ -161,7 +161,6 @@ public void CreateGUI()
             if (environmentHandle == null) Debug.LogWarning("Handle not found in UXML");
             else environmentHandle.AddManipulator(new Clickable(evt => SwapEnvironment()));
 
-            // environmentBackground?.SetTooltip("Stage");
             if (environmentBackground != null) environmentBackground.tooltip = "Stage";
 
             environmentElement = root.Q<VisualElement>("Environment");
@@ -187,9 +186,9 @@ public void CreateGUI()
             menuLogoutBtn = root.Q<Button>("LogoutBtn");
             if (menuLogoutBtn != null)
                 menuLogoutBtn.clickable.clicked += () => { ConfirmLogout(); };
+            if (menuChangeGameBtn != null) menuChangeGameBtn.clickable.clicked += () => { RequestFlowSwitch(gameSelectorFlow); };
 
-            // menuChangeGameBtn?.clickable.clicked += () => { SwapFlows(gameSelectorFlow); };
-            if (menuChangeGameBtn != null) menuChangeGameBtn.clickable.clicked += () => { SwapFlows(gameSelectorFlow); };
+            if (menuAPIKeyBtn != null) menuAPIKeyBtn.clickable.clicked += () => { RequestFlowSwitch(apiKeyFlow); };
 
             popup = root.Q<VisualElement>("PopUp");
             if (popup == null) Debug.LogWarning("PopUp not found in UXML");
@@ -265,7 +264,63 @@ public void CreateGUI()
                 createNewApiKeyBtn.clickable.clicked += () =>
                 {
                     if (newApiKeyWindow != null) newApiKeyWindow.style.display = DisplayStyle.Flex;
+                };            // Settings UI
+            settingsFlow = root.Q<VisualElement>("SettingsFlow");
+            settingsBtn = root.Q<Button>("SettingsBtn");
+            settingsBackBtn = root.Q<Button>("SettingsBackBtn");
+            // Save/Cancel buttons no longer needed - settings save immediately
+            gameVersionField = root.Q<TextField>("GameVersionField");
+            gameVersionWarning = root.Q<Label>("GameVersionWarning");
+            logLevelField = root.Q<EnumField>("LogLevelField");
+            logErrorsAsWarningsToggle = root.Q<Toggle>("LogErrorsAsWarningsToggle");
+            logInBuildsToggle = root.Q<Toggle>("LogInBuildsToggle");
+            allowTokenRefreshToggle = root.Q<Toggle>("AllowTokenRefreshToggle");            // Set up immediate save callbacks (only once during initialization)
+            if (gameVersionField != null) gameVersionField.RegisterValueChangedCallback(evt => { 
+                SaveGameVersion(evt.newValue); 
+            });
+            if (logLevelField != null) logLevelField.RegisterValueChangedCallback(evt => { 
+                SaveLogLevel((LootLockerLogger.LogLevel)evt.newValue); 
+            });            if (logErrorsAsWarningsToggle != null) logErrorsAsWarningsToggle.RegisterValueChangedCallback(evt => { 
+                SaveLogErrorsAsWarnings(evt.newValue); 
+            });
+            if (logInBuildsToggle != null) logInBuildsToggle.RegisterValueChangedCallback(evt => { 
+                SaveLogInBuilds(evt.newValue); 
+            });
+            if (allowTokenRefreshToggle != null) allowTokenRefreshToggle.RegisterValueChangedCallback(evt => { 
+                SaveAllowTokenRefresh(evt.newValue); 
+            });
+              if (settingsBtn != null) 
+            {
+                settingsBtn.clickable.clicked += () => { 
+                    previousFlow = currentFlow; // Store current flow before switching
+                    RequestFlowSwitch(settingsFlow, LoadSettingsUI); 
+                };
+                // Set the Unity built-in settings icon
+                var settingsIcon = EditorGUIUtility.IconContent("SettingsIcon");
+                if (settingsIcon != null && settingsIcon.image != null)
+                {
+                    settingsBtn.style.backgroundImage = new StyleBackground(settingsIcon.image as Texture2D);
+                }
+            }
+            
+            // Settings back button
+            if (settingsBackBtn != null)
+            {
+                settingsBackBtn.clickable.clicked += () => {
+                    if (previousFlow != null)
+                    {
+                        RequestFlowSwitch(previousFlow);
+                        previousFlow = null; // Clear previous flow after going back
+                    }
+                    else
+                    {
+                        // Default to API Keys if no previous flow
+                        RequestFlowSwitch(apiKeyFlow);
+                    }
                 };
+            }            // Save/Cancel buttons no longer needed - settings save immediately
+            if (settingsFlow != null) settingsFlow.style.display = DisplayStyle.None;
+            // Settings button will be shown when user is authenticated
 
             isStage = LootLockerEditorData.IsEnvironmentStage();
             if (isStage)
@@ -317,7 +372,7 @@ private bool IsStageOnlyGame()
             var game = gameData[selectedGameId];
             if (game.created_at == default(System.DateTime) || game.created_at == null) return false;
             var cutoff = new System.DateTime(2025, 3, 10);
-            return game.created_at < cutoff;
+            return game.created_at >= cutoff;
         }
 
         void SwapEnvironment()
@@ -362,12 +417,11 @@ void SwapFlows(VisualElement New)
                 }
             }
             New.style.display = DisplayStyle.Flex;
-            if (securityWarning != null) securityWarning.style.display = DisplayStyle.None;
-            
-            if (activeFlow == gameSelectorFlow)
+            if (securityWarning != null) securityWarning.style.display = DisplayStyle.None;            if (activeFlow == gameSelectorFlow)
             {
                 if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
                 if (gameName != null) gameName.text = "LootLocker";
+                if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.None;
                 // Remove hardcoded credentials
                 if (emailField != null) emailField.value = "";
                 if (passwordField != null) passwordField.value = "";
@@ -375,16 +429,17 @@ void SwapFlows(VisualElement New)
                 if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
                 if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
                 CreateGameButtons();
-            }
-            if (activeFlow == apiKeyFlow)
+            }if (activeFlow == apiKeyFlow)
             {
+                if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.Flex;
                 if (gameName != null) gameName.text = LootLockerEditorData.GetSelectedGameName();
                 UpdateLicenseCountdownUI();
                 SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
                 if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.Flex;
+                  // Show environment switcher only for non-stage-only games
                 if (environmentElement != null && environmentBackground != null && environmentHandle != null && environmentTitle != null)
                 {
-                    if (IsStageOnlyGame())
+                    if (!IsStageOnlyGame())
                     {
                         environmentElement.style.display = DisplayStyle.Flex;
                         environmentBackground.style.display = DisplayStyle.Flex;
@@ -397,16 +452,26 @@ void SwapFlows(VisualElement New)
                 }
                 RefreshAPIKeys();
             }
-            if (activeFlow == loginFlow)
+            if (activeFlow == settingsFlow)
             {
+                if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.Flex;
                 if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
+                SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
                 if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
+                if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
+                LoadSettingsUI();
+            }
+            if (activeFlow == loginFlow)
+            {
+                if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
+                if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.None;
                 if (menu != null) menu.style.display = DisplayStyle.None;
                 if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
                 if (securityWarning != null) securityWarning.style.display = DisplayStyle.Flex;
             }
             if (activeFlow == mfaFlow)
             {
+                if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.None;
                 SetMenuVisibility(apiKey: false, changeGame: false, logout: true);
             }
             currentFlow = New;
@@ -909,6 +974,88 @@ private void LicenseCountdownContainerClick(MouseDownEvent evt)
         {
             Application.OpenURL("https://console.lootlocker.com");
             evt.StopPropagation();
+        }        // Settings UI
+        private Button settingsBtn; // Save/Cancel buttons no longer needed
+        private Button settingsBackBtn;
+        private TextField gameVersionField;
+        private Label gameVersionWarning;
+        private EnumField logLevelField;        private Toggle logErrorsAsWarningsToggle, logInBuildsToggle, allowTokenRefreshToggle;
+        // Settings now save immediately - no need for change tracking
+
+        // Individual save methods for immediate saving
+        private void SaveGameVersion(string newVersion)
+        {
+            if (!IsSemverString(newVersion))
+            {
+                if (gameVersionWarning != null)
+                {
+                    gameVersionWarning.text = "Game version must be in format X.Y.Z.B (MAJOR.MINOR.PATCH.BUILD, last two optional)";
+                    gameVersionWarning.style.display = DisplayStyle.Flex;
+                }
+                return;
+            }
+            
+            if (gameVersionWarning != null) gameVersionWarning.style.display = DisplayStyle.None;
+            LootLockerConfig.current.game_version = newVersion;
+            SaveConfig();
+        }
+
+        private void SaveLogLevel(LootLockerLogger.LogLevel newLogLevel)
+        {
+            LootLockerConfig.current.logLevel = newLogLevel;
+            SaveConfig();
+        }
+
+        private void SaveLogErrorsAsWarnings(bool newValue)
+        {
+            LootLockerConfig.current.logErrorsAsWarnings = newValue;
+            SaveConfig();
+        }
+
+        private void SaveLogInBuilds(bool newValue)
+        {
+            LootLockerConfig.current.logInBuilds = newValue;
+            SaveConfig();
+        }
+
+        private void SaveAllowTokenRefresh(bool newValue)
+        {
+            LootLockerConfig.current.allowTokenRefresh = newValue;
+            SaveConfig();
+        }
+
+        private void SaveConfig()
+        {
+            EditorUtility.SetDirty(LootLockerConfig.current);
+#if UNITY_EDITOR
+            UnityEditor.AssetDatabase.SaveAssets();
+#endif
+        }        // Loads current LootLockerConfig values into the settings UI
+        private void LoadSettingsUI()
+        {
+            // Force reload the config to ensure we have the latest values
+            var config = LootLockerConfig.current;
+            if (gameVersionField != null) gameVersionField.SetValueWithoutNotify(config.game_version);
+            if (logLevelField != null) {
+                // Initialize the enum field first, then set value without notification
+                logLevelField.Init(config.logLevel);
+                logLevelField.SetValueWithoutNotify(config.logLevel);
+            }
+            if (logErrorsAsWarningsToggle != null) logErrorsAsWarningsToggle.SetValueWithoutNotify(config.logErrorsAsWarnings);
+            if (logInBuildsToggle != null) logInBuildsToggle.SetValueWithoutNotify(config.logInBuilds);            if (allowTokenRefreshToggle != null) allowTokenRefreshToggle.SetValueWithoutNotify(config.allowTokenRefresh);
+            if (gameVersionWarning != null) gameVersionWarning.style.display = DisplayStyle.None;
+        }
+
+        private static bool IsSemverString(string str)
+        {
+            return System.Text.RegularExpressions.Regex.IsMatch(str,
+                @"^(0|[1-9]\d*)\.(0|[1-9]\d*)(?:\.(0|[1-9]\d*))?(?:\.(0|[1-9]\d*))?$" );
+        }
+
+        // Simple flow switching - no save confirmation needed since settings save immediately
+        void RequestFlowSwitch(VisualElement targetFlow, System.Action onSuccess = null)        {
+            SwapFlows(targetFlow);
+            onSuccess?.Invoke();
         }
     }
 }
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uss b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uss
index d43c2f1d..ddf9e959 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uss	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uss	
@@ -113,3 +113,14 @@
     cursor: link;
     margin-left: 2px;
 }
+
+#SettingsBtn {
+    background-size: 16px 16px;
+    background-repeat: no-repeat;
+    background-position: center;
+    -unity-background-scale-mode: scale-to-fit;
+}
+
+#SettingsBtn:hover {
+    background-color: rgba(90, 90, 90, 0.8);
+}
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml
index b34d8f71..114f5a07 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml	
@@ -1,25 +1,23 @@
 <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="True">
-    <Style src="project://database/Assets/LootLockerSDK/Editor/Editor%20UI/LootLockerAdminExtension.uss?fileID=7433441132597879392&amp;guid=f1130e18dfb99e04cbd54f3fac00ff15&amp;type=3#LootLockerAdminExtension" />
-    <ui:VisualElement style="align-self: stretch; justify-content: center; align-items: stretch; height: 100%;">
-        <ui:VisualElement name="Topbar" style="flex-grow: 1; visibility: visible; display: flex; border-bottom-width: 2px; border-bottom-color: rgb(46, 46, 46); flex-direction: row; justify-content: flex-start; align-self: auto; align-items: stretch; flex-wrap: wrap;">
+    <Style src="project://database/Assets/LootLockerSDK/Editor/Editor%20UI/LootLockerAdminExtension.uss?fileID=7433441132597879392&amp;guid=f1130e18dfb99e04cbd54f3fac00ff15&amp;type=3#LootLockerAdminExtension" />    <ui:VisualElement style="align-self: stretch; justify-content: center; align-items: stretch; height: 100%;">        <ui:VisualElement name="Topbar" style="flex-grow: 0; flex-shrink: 0; visibility: visible; display: flex; border-bottom-width: 2px; border-bottom-color: rgb(46, 46, 46); flex-direction: row; justify-content: flex-start; align-self: auto; align-items: center; min-height: 60px; max-height: 60px;">
             <ui:Label tabindex="-1" text="LootLocker" display-tooltip-when-elided="true" name="GameName" style="align-items: flex-start; align-self: center; font-size: 28px; -unity-text-align: middle-left; text-overflow: clip; width: auto; white-space: nowrap; max-width: 750px; margin-left: 24px; justify-content: flex-start;" />
             <ui:VisualElement name="LicenseCountdownContainer" style="flex-direction: row; align-items: center; align-self: center; margin-left: 12px;">
                 <ui:Label name="LicenseCountdownLabel" text="" style="font-size: 14px; color: rgb(255, 200, 0); margin-right: 4px; display: none;" />
-                <ui:Image name="LicenseCountdownIcon" style="width: 16px; height: 16px; display: none; cursor: link;" />
-            </ui:VisualElement>
-            <ui:VisualElement name="Environment" style="flex-grow: 1; flex-direction: row; flex-shrink: 1; align-self: stretch; justify-content: flex-end; margin-right: 24px;">
-                <ui:Label tabindex="-1" text="Environment: Stage" display-tooltip-when-elided="true" name="EnvironmentTitle" style="align-items: flex-start; align-self: center; font-size: 14px; -unity-text-align: middle-left; text-overflow: clip; white-space: nowrap; margin-right: 8px;" />
-                <ui:VisualElement name="SwitchBackground" class="environmentToStageBackground" style="flex-grow: 1; background-color: rgb(28, 232, 109); min-width: 0; min-height: 26px; border-top-left-radius: 12px; border-top-right-radius: 12px; border-bottom-right-radius: 12px; border-bottom-left-radius: 12px; align-items: auto; align-self: center; max-width: 45px; justify-content: center; flex-shrink: 0;">
-                    <ui:VisualElement name="Handle" style="flex-grow: 1; background-color: rgb(255, 255, 255); align-self: flex-start; align-items: flex-end; justify-content: flex-start; border-top-left-radius: 90px; border-top-right-radius: 90px; border-bottom-right-radius: 90px; border-bottom-left-radius: 90px; margin-right: 4px; margin-left: 4px; flex-shrink: 0; width: 20px; height: 20px; min-width: 20px; min-height: 20px; max-height: 20px; max-width: 20px; margin-top: 0;" />
+                <ui:Image name="LicenseCountdownIcon" style="width: 16px; height: 16px; display: none; cursor: link;" />            </ui:VisualElement>            
+            <ui:VisualElement style="flex-grow: 1; flex-direction: row; align-items: center; justify-content: flex-end;">                <ui:VisualElement name="Environment" style="flex-grow: 0; flex-direction: row; flex-shrink: 1; align-self: center; justify-content: flex-end; margin-right: 8px; align-items: center;">
+                    <ui:Label tabindex="-1" text="Environment: Stage" display-tooltip-when-elided="true" name="EnvironmentTitle" style="align-items: flex-start; align-self: center; font-size: 14px; -unity-text-align: middle-left; text-overflow: clip; white-space: nowrap; margin-right: 8px;" />
+                    <ui:VisualElement name="SwitchBackground" class="environmentToStageBackground" style="flex-grow: 1; background-color: rgb(28, 232, 109); min-width: 40px; min-height: 26px; border-top-left-radius: 12px; border-top-right-radius: 12px; border-bottom-right-radius: 12px; border-bottom-left-radius: 12px; align-items: auto; align-self: center; max-width: 80px; justify-content: center; flex-shrink: 0;">
+                        <ui:VisualElement name="Handle" style="flex-grow: 1; background-color: rgb(255, 255, 255); align-self: flex-start; align-items: flex-end; justify-content: flex-start; border-top-left-radius: 90px; border-top-right-radius: 90px; border-bottom-right-radius: 90px; border-bottom-left-radius: 90px; margin-right: 4px; margin-left: 4px; flex-shrink: 0; width: 20px; height: 20px; min-width: 20px; min-height: 20px; max-height: 20px; max-width: 20px; margin-top: 0;" />
+                    </ui:VisualElement>                </ui:VisualElement>
+                <ui:VisualElement name="SettingsContainer" style="flex-direction: row; align-items: center; align-self: center; margin-right: 24px;">
+                    <ui:Button name="SettingsBtn" tooltip="Settings" style="width: 28px; height: 28px; align-self: center; background-color: rgba(60, 60, 60, 0); border-width: 1px; border-color: rgba(100,100,100,0.0); border-radius: 0px; font-size: 18px; cursor: link; display: none; color: rgb(200,200,200);" />
                 </ui:VisualElement>
             </ui:VisualElement>
-        </ui:VisualElement>
-        <ui:VisualElement name="ContentView" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); margin-top: 0; opacity: 1; bottom: 0; top: 0; height: 100%;">
-            <ui:VisualElement name="MenuBar" style="flex-grow: 1; visibility: visible; display: flex; border-bottom-width: 2px; border-bottom-color: rgb(46, 46, 46); flex-direction: row; justify-content: flex-start; align-self: auto; align-items: stretch; margin-left: 0; margin-bottom: 12px; flex-wrap: wrap;">
-                <ui:VisualElement name="DynamicMenu" style="flex-grow: 1; flex-direction: row;">
+        </ui:VisualElement>        <ui:VisualElement name="ContentView" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); margin-top: 0; opacity: 1; bottom: 0; top: 0; height: 100%;">            <ui:VisualElement name="MenuBar" style="flex-grow: 0; flex-shrink: 0; visibility: visible; display: flex; border-bottom-width: 2px; border-bottom-color: rgb(46, 46, 46); flex-direction: row; justify-content: flex-start; align-self: auto; align-items: center; margin-left: 0; margin-bottom: 12px; min-height: 40px;">
+                <ui:VisualElement name="DynamicMenu" style="flex-grow: 1; flex-direction: row; align-items: center;">
                     <ui:Button text="API Keys" display-tooltip-when-elided="true" name="APIKeyBtn" class="menuBtn" style="-unity-font-style: bold; background-color: rgba(188, 188, 188, 0); border-left-color: rgba(149, 149, 149, 0); border-right-color: rgba(149, 149, 149, 0); border-top-color: rgba(149, 149, 149, 0); border-bottom-color: rgba(149, 149, 149, 0); margin-left: 20px;" />
                 </ui:VisualElement>
-                <ui:VisualElement name="StaticMenu" style="flex-grow: 0; align-self: flex-end; flex-direction: row-reverse; margin-right: 15px;">
+                <ui:VisualElement name="StaticMenu" style="flex-grow: 0; align-self: center; flex-direction: row-reverse; margin-right: 15px; align-items: center;">
                     <ui:Button text="Logout" display-tooltip-when-elided="true" name="LogoutBtn" class="menuBtn" style="-unity-font-style: bold; background-color: rgba(221, 221, 221, 0); border-left-color: rgba(149, 149, 149, 0); border-right-color: rgba(149, 149, 149, 0); border-top-color: rgba(149, 149, 149, 0); border-bottom-color: rgba(149, 149, 149, 0);" />
                     <ui:Button text="Change Game" display-tooltip-when-elided="true" name="ChangeGameBtn" class="menuBtn" style="background-color: rgba(188, 188, 188, 0); border-left-color: rgba(149, 149, 149, 0); border-right-color: rgba(149, 149, 149, 0); border-top-color: rgba(149, 149, 149, 0); border-bottom-color: rgba(149, 149, 149, 0); -unity-font-style: bold;" />
                 </ui:VisualElement>
@@ -66,6 +64,17 @@
                     <ui:Label tabindex="-1" text="Select a key to use" display-tooltip-when-elided="true" name="Title" style="font-size: 14px; align-items: auto; justify-content: space-evenly; align-self: center; margin-bottom: 10px; padding-top: 0; margin-top: 0;" />
                     <ui:ScrollView name="APIKeyList" style="background-color: rgb(53, 53, 53); flex-direction: column-reverse;" />
                 </ui:VisualElement>
+            </ui:VisualElement>            <ui:VisualElement name="SettingsFlow" style="flex-grow: 1; flex-direction: column; display: none; padding: 32px; align-items: flex-start;">
+                <ui:Label text="LootLocker Settings" style="font-size: 24px; margin-bottom: 16px;" />
+                <ui:Label text="Game Version" style="margin-bottom: 4px;" />
+                <ui:TextField name="GameVersionField" style="margin-bottom: 12px; min-width: 200px;" />
+                <ui:Label name="GameVersionWarning" text="" style="color: rgb(255,80,80); margin-bottom: 8px; display: none;" />
+                <ui:Label text="Log Level" style="margin-bottom: 4px;" />
+                <ui:EnumField name="LogLevelField" style="margin-bottom: 12px; min-width: 200px;" />
+                <ui:Toggle name="LogErrorsAsWarningsToggle" label="Log Errors As Warnings" style="margin-bottom: 8px;" />
+                <ui:Toggle name="LogInBuildsToggle" label="Log In Builds" style="margin-bottom: 8px;" />
+                <ui:Toggle name="AllowTokenRefreshToggle" label="Allow Token Refresh" style="margin-bottom: 24px;" />
+                <ui:Button text="← Back" name="SettingsBackBtn" style="align-self: flex-start; font-size: 12px; padding: 4px 8px; background-color: rgba(80, 80, 80, 0.3); border-color: rgba(120, 120, 120, 0.5); color: rgb(180, 180, 180);" />
             </ui:VisualElement>
         </ui:VisualElement>
     </ui:VisualElement>
diff --git a/Runtime/Editor/LootLockerExtensionCalls.cs b/Runtime/Editor/LootLockerExtensionCalls.cs
index 8f197156..8e90f43d 100644
--- a/Runtime/Editor/LootLockerExtensionCalls.cs
+++ b/Runtime/Editor/LootLockerExtensionCalls.cs
@@ -6,19 +6,58 @@
 using LootLocker.Extension.Responses;
 
 namespace LootLocker.Extension
-{
-    public partial class LootLockerAdminManager
+{    public partial class LootLockerAdminManager
     {
-
+        private static LootLockerLogger.LogLevel? savedLogLevel = null;
+        private static int activeAdminRequestCount = 0;
+        
         public static void SendAdminRequest(string endPoint, LootLockerHTTPMethod httpMethod, string json, Action<LootLockerResponse> onComplete, bool useAuthToken)
         {
-            LootLockerLogger.LogLevel logLevelSavedState = LootLockerConfig.current.logLevel;
-            LootLockerConfig.current.logLevel = LootLockerLogger.LogLevel.None;
-
-            LootLockerServerRequest.CallAPI(null, endPoint, httpMethod, json, onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); LootLockerConfig.current.logLevel = logLevelSavedState; },
-                useAuthToken: useAuthToken,
-                callerRole: LootLockerEnums.LootLockerCallerRole.Admin);
+            // Only save the log level if this is the first admin request
+            if (activeAdminRequestCount == 0)
+            {
+                savedLogLevel = LootLockerConfig.current.logLevel;
+                LootLockerConfig.current.logLevel = LootLockerLogger.LogLevel.None;
+            }
+            activeAdminRequestCount++;
 
+            try
+            {
+                LootLockerServerRequest.CallAPI(null, endPoint, httpMethod, json, onComplete: (serverResponse) => { 
+                    // Always restore log level, regardless of success or failure
+                    try 
+                    {
+                        LootLockerResponse.Deserialize(onComplete, serverResponse); 
+                    } finally 
+                    {
+                        activeAdminRequestCount--;
+                        // Only restore log level when all admin requests are complete
+                        if (activeAdminRequestCount == 0 && savedLogLevel.HasValue)
+                        {
+                            LootLockerConfig.current.logLevel = savedLogLevel.Value;
+                            savedLogLevel = null;
+#if UNITY_EDITOR
+                            UnityEditor.EditorUtility.SetDirty(LootLockerConfig.current);
+#endif
+                        }
+                    }
+                },
+                    useAuthToken: useAuthToken,
+                    callerRole: LootLockerEnums.LootLockerCallerRole.Admin);
+            } catch
+            {
+                // If CallAPI itself throws an exception, restore the log level
+                activeAdminRequestCount--;
+                if (activeAdminRequestCount == 0 && savedLogLevel.HasValue)
+                {
+                    LootLockerConfig.current.logLevel = savedLogLevel.Value;
+                    savedLogLevel = null;
+#if UNITY_EDITOR
+                    UnityEditor.EditorUtility.SetDirty(LootLockerConfig.current);
+#endif
+                }
+                throw; // Re-throw the exception
+            }
         }
 
         public static void AdminLogin(string email, string password, Action<LoginResponse> onComplete)

From 63a986d44c6e837807b9a3c4da8645af3a6b8931 Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Tue, 17 Jun 2025 15:06:51 +0200
Subject: [PATCH 05/12] scout: Refactored extension for readability

---
 ...LootLockerAdminExtension.Authentication.cs |  227 ++++
 ...ockerAdminExtension.Authentication.cs.meta |    2 +
 .../LootLockerAdminExtension.EventHandlers.cs |  154 +++
 ...LockerAdminExtension.EventHandlers.cs.meta |    2 +
 ...LootLockerAdminExtension.GameManagement.cs |  198 ++++
 ...ockerAdminExtension.GameManagement.cs.meta |    2 +
 .../LootLockerAdminExtension.Settings.cs      |  100 ++
 .../LootLockerAdminExtension.Settings.cs.meta |    2 +
 .../Editor UI/LootLockerAdminExtension.UI.cs  |  246 ++++
 .../LootLockerAdminExtension.UI.cs.meta       |    2 +
 .../Editor UI/LootLockerAdminExtension.cs     | 1022 +++--------------
 Runtime/Editor/LootLockerExtensionCalls.cs    |   24 +-
 12 files changed, 1079 insertions(+), 902 deletions(-)
 create mode 100644 Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs
 create mode 100644 Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs.meta
 create mode 100644 Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs
 create mode 100644 Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs.meta
 create mode 100644 Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs
 create mode 100644 Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs.meta
 create mode 100644 Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs
 create mode 100644 Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs.meta
 create mode 100644 Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs
 create mode 100644 Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs.meta

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs
new file mode 100644
index 00000000..95e39f79
--- /dev/null
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs	
@@ -0,0 +1,227 @@
+using System;
+using LootLocker.Extension.Responses;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor;
+
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER && !LOOTLOCKER_DISABLE_EDITOR_EXTENSION
+namespace LootLocker.Extension
+{
+    public partial class LootLockerAdminExtension : EditorWindow
+    {
+        public void Login()
+        {
+            if (string.IsNullOrEmpty(emailField?.value) || string.IsNullOrEmpty(passwordField?.value))
+            {
+                ShowPopup("Error", "Email or Password is empty.");
+                HideLoading();
+                return;
+            }
+
+            ShowLoadingAndExecute(() =>
+            {
+                try
+                {
+                    LootLockerAdminManager.AdminLogin(emailField.value, passwordField.value, OnLoginComplete);
+                }
+                catch (Exception ex)
+                {
+                    ShowPopup("Error", $"Unexpected error: {ex.Message}");
+                    HideLoading();
+                }
+            });
+        }
+
+        private void OnLoginComplete(LoginResponse response)
+        {
+            if (!response.success)
+            {
+                string errorMsg = !string.IsNullOrEmpty(response.errorData?.message) 
+                    ? response.errorData.message 
+                    : "We couldn't recognize your information or there is no user with this email, please check and try again!";
+                ShowPopup("Error", errorMsg);
+                HideLoading();
+                return;
+            }
+
+            if (response.mfa_key != null)
+            {
+                mfaKey = response.mfa_key;
+                if (menu != null) menu.style.display = DisplayStyle.Flex;
+                HideLoading();
+                SwapFlows(mfaFlow);
+            }
+            else
+            {
+                CompleteLogin(response.auth_token);
+            }
+
+            if (menuLogoutBtn != null) menuLogoutBtn.style.display = DisplayStyle.Flex;
+        }
+
+        private void CompleteLogin(string authToken)
+        {
+            if (menu != null) menu.style.display = DisplayStyle.Flex;
+            LootLockerConfig.current.adminToken = authToken;
+            LootLockerEditorData.SetAdminToken(authToken);
+            HideLoading();
+            SwapFlows(gameSelectorFlow);
+        }
+
+        public void SignIn(EventBase e)
+        {
+            ShowLoadingAndExecute(() =>
+            {
+                LootLockerAdminManager.MFAAuthenticate(mfaKey, codeField.value, (onComplete) =>
+                {
+                    if (!onComplete.success)
+                    {
+                        ShowPopup("Error", "Could not authenticate MFA!");
+                        HideLoading();
+                        return;
+                    }
+
+                    CompleteLogin(onComplete.auth_token);
+                    SwapFlows(gameSelectorFlow);
+                });
+            });
+        }
+
+        public void RefreshUserInformation(Action onComplete)
+        {
+            ShowLoadingAndExecute(() =>
+            {
+                LootLockerAdminManager.GetUserInformation((response) =>
+                {
+                    if (!response.success)
+                    {
+                        ShowPopup("Error", "Your token has expired, will redirect you to Login page now!");
+                        Debug.Log(response.errorData.message);
+                        HideLoading();
+                        Logout();
+                        return;
+                    }
+
+                    ProcessUserInformation(response);
+                    UpdateLicenseCountdownUI();
+                    gameDataRefreshTime = DateTime.Now;
+                    onComplete?.Invoke();
+                    HideLoading();
+                });
+            });
+        }
+
+        private void ProcessUserInformation(LoginResponse response)
+        {
+            gameData.Clear();
+
+            foreach (var org in response.user.organisations)
+            {
+                foreach (var game in org.games)
+                {
+                    if (game.id == LootLockerEditorData.GetSelectedGame() || game.development.id == LootLockerEditorData.GetSelectedGame())
+                    {
+                        LootLockerEditorData.SetSelectedGameName(game.name);
+                    }
+                    game.organisation_name = org.name;
+                    gameData.Add(game.id, game);
+                }
+            }
+        }
+
+        void CreateNewAPIKey()
+        {
+            int gameId = LootLockerEditorData.GetSelectedGame();
+            if (gameId == 0)
+            {
+                ShowPopup("Error", "No active Game found!");
+                return;
+            }
+
+            if (isStage && gameData.ContainsKey(gameId))
+            {
+                gameId = gameData[gameId].development.id;
+            }
+
+            ShowLoadingAndExecute(() =>
+            {
+                LootLockerAdminManager.GenerateKey(gameId, newApiKeyName.value, "game", (onComplete) =>
+                {
+                    if (!onComplete.success)
+                    {
+                        ShowPopup("Error", "Could not create a new API Key!");
+                        HideLoading();
+                        return;
+                    }
+
+                    APIKeyTemplate(onComplete);
+                    HideLoading();
+                });
+            });
+
+            if (newApiKeyName != null) newApiKeyName.value = "";
+        }
+
+        public void RefreshAPIKeys()
+        {
+            if (apiKeyList != null) apiKeyList.Clear();
+            
+            int gameID = LootLockerEditorData.GetSelectedGame();
+            if (isStage && gameData.ContainsKey(gameID))
+            {
+                gameID = gameData[gameID].development.id;
+            }
+            
+            isLoadingKeys = true;
+
+            ShowLoadingAndExecute(() =>
+            {
+                LootLockerAdminManager.GetAllKeys(gameID, (onComplete) =>
+                {
+                    if (!onComplete.success)
+                    {
+                        ShowPopup("Error", "Could not find API Keys!");
+                        HideLoading();
+                        return;
+                    }
+
+                    foreach (var key in onComplete.api_keys)
+                    {
+                        APIKeyTemplate(key);
+                    }
+
+                    isLoadingKeys = false;
+                    HideLoading();
+                });
+            });
+        }
+
+        void ConfirmLogout()
+        {
+            ShowPopup("Confirm Logout", "Are you sure you want to log out? This will clear your admin token and settings.");
+            if (popupBtn != null)
+            {
+                popupBtn.clickable.clickedWithEventInfo -= ClosePopup;
+                popupBtn.clickable.clickedWithEventInfo += (evt) =>
+                {
+                    Logout();
+                    ClosePopup(evt);
+                };
+            }
+        }
+
+        void Logout()
+        {
+            if (loadingPage != null) loadingPage.style.display = DisplayStyle.Flex;
+            LootLockerEditorData.ClearLootLockerPrefs();
+
+            gameData.Clear();
+            if (apiKeyList != null) apiKeyList.Clear();
+            if (gameSelectorList != null) gameSelectorList.Clear();
+            
+            if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
+            SwapFlows(loginFlow);
+        }
+    }
+}
+#endif
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs.meta b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs.meta
new file mode 100644
index 00000000..3566ac5a
--- /dev/null
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: f924e8470f005be4a8ec210a98c07efa
\ No newline at end of file
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs
new file mode 100644
index 00000000..0f9eee00
--- /dev/null
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs	
@@ -0,0 +1,154 @@
+using System;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor;
+
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER && !LOOTLOCKER_DISABLE_EDITOR_EXTENSION
+namespace LootLocker.Extension
+{
+    public partial class LootLockerAdminExtension : EditorWindow
+    {
+        // Event handlers for UI interactions
+        private void OnPasswordKeyDown(KeyDownEvent evt)
+        {
+            if (evt.keyCode == KeyCode.Return)
+            {
+                Login();
+            }
+        }
+
+        private void OnNewApiKeyCancelClick(MouseDownEvent evt)
+        {
+            if (newApiKeyName != null) newApiKeyName.value = "";
+            if (newApiKeyWindow != null) newApiKeyWindow.style.display = DisplayStyle.None;
+        }
+
+        private void OnCreateApiKeyClick()
+        {
+            CreateNewAPIKey();
+            if (newApiKeyWindow != null) newApiKeyWindow.style.display = DisplayStyle.None;
+        }
+
+        private void OnCreateNewApiKeyClick()
+        {
+            if (newApiKeyWindow != null) newApiKeyWindow.style.display = DisplayStyle.Flex;
+        }
+
+        private void OnSettingsClick()
+        {
+            previousFlow = currentFlow;
+            RequestFlowSwitch(settingsFlow, LoadSettingsUI);
+        }
+
+        private void OnSettingsBackClick()
+        {
+            if (previousFlow != null)
+            {
+                RequestFlowSwitch(previousFlow);
+                previousFlow = null;
+            }
+            else
+            {
+                RequestFlowSwitch(apiKeyFlow);
+            }
+        }
+
+        private void OnGameSelected(EventBase e)
+        {
+            if (!AtTarget(e)) return;
+
+            var target = e.target as Button;
+            if (target == null) return;
+
+            LootLockerEditorData.SetSelectedGame(target.name);
+            var selectedGameData = gameData[int.Parse(target.name)];
+
+            LootLockerEditorData.SetSelectedGameName(selectedGameData.name);
+            gameName.text = selectedGameData.name;
+            UpdateLicenseCountdownUI();
+
+            LootLockerEditorData.SetEnvironmentStage();
+            isStage = true;
+
+            ShowLoadingAndExecute(() =>
+            {
+                LootLockerAdminManager.GetGameDomainKey(LootLockerEditorData.GetSelectedGame(), (onComplete) =>
+                {
+                    HideLoading();
+                    if (!onComplete.success)
+                    {
+                        ShowPopup("Error", "Could not find Selected game!");
+                        return;
+                    }
+                    LootLockerConfig.current.domainKey = onComplete.game.domain_key;
+                });
+            });
+
+            SwapFlows(apiKeyFlow);
+        }
+
+        private void OnAPIKeySelected(EventBase e)
+        {
+            if (!AtTarget(e)) return;
+
+            var target = e.target as Button;
+            if (target == null) return;
+
+            LootLockerConfig.current.apiKey = target.name;
+            SwapNewSelectedKey();
+            ShowPopup("API Key Selected", $"API Key {target.name} is now active.");
+        }
+
+        private void LicenseCountdownIconClick(MouseDownEvent evt)
+        {
+            Application.OpenURL("https://console.lootlocker.com");
+            evt.StopPropagation();
+        }
+
+        private void LicenseCountdownContainerClick(MouseDownEvent evt)
+        {
+            Application.OpenURL("https://console.lootlocker.com");
+            evt.StopPropagation();
+        }
+
+        private bool AtTarget(EventBase eventBase)
+        {
+#if UNITY_2023_1_OR_NEWER
+            return eventBase.propagationPhase == PropagationPhase.BubbleUp;
+#else
+            return eventBase.propagationPhase == PropagationPhase.AtTarget;
+#endif
+        }
+
+        private void OnEditorUpdate()
+        {
+            EditorApplication.QueuePlayerLoopUpdate();
+        }
+
+        private void ShowPopup(string title, string message)
+        {
+            if (popupTitle != null) popupTitle.text = title;
+            if (popupMessage != null) popupMessage.text = message;
+            if (popup != null) popup.style.display = DisplayStyle.Flex;
+        }
+
+        private void ClosePopup(EventBase e)
+        {
+            if (popup != null) popup.style.display = DisplayStyle.None;
+        }
+
+        private void ShowLoadingAndExecute(Action action)
+        {
+            EditorApplication.update += OnEditorUpdate;
+            if (loadingPage != null) loadingPage.style.display = DisplayStyle.Flex;
+            action?.Invoke();
+        }
+
+        private void HideLoading()
+        {
+            EditorApplication.update -= OnEditorUpdate;
+            if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
+        }
+    }
+}
+#endif
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs.meta b/Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs.meta
new file mode 100644
index 00000000..ae3279fc
--- /dev/null
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2bc922f0c53dab7499e00d65aa97fdec
\ No newline at end of file
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs
new file mode 100644
index 00000000..52793015
--- /dev/null
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs	
@@ -0,0 +1,198 @@
+using System;
+using LootLocker.Extension.Responses;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor;
+
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER && !LOOTLOCKER_DISABLE_EDITOR_EXTENSION
+namespace LootLocker.Extension
+{
+    public partial class LootLockerAdminExtension : EditorWindow
+    {
+        public void CreateGameButtons()
+        {
+            if (gameSelectorList != null) gameSelectorList.Clear();
+
+            var action = new Action(() =>
+            {
+                foreach (var game in gameData.Values)
+                {
+                    GameButtonTemplate(game, game.organisation_name);
+                }
+            });
+
+            if (gameDataRefreshTime == null || 
+                DateTime.Now >= gameDataRefreshTime.AddMinutes(gameDataCacheExpirationTimeMinutes) || 
+                LootLockerEditorData.IsNewSession())
+            {
+                RefreshUserInformation(action);
+            }
+            else
+            {
+                action();
+            }
+        }
+
+        public void GameButtonTemplate(LootLocker.Extension.DataTypes.Game game, string orgName)
+        {
+            Button button = new Button();
+            button.style.flexDirection = FlexDirection.Column;
+            button.name = game.id.ToString();
+            button.AddToClassList("gameButton");
+
+            Label gameTitle = new Label();
+            gameTitle.text = game.name;
+            gameTitle.name = "GameTitle";
+            gameTitle.AddToClassList("gameButtonTitle");
+            button.Add(gameTitle);
+
+            Label gameOrg = new Label();
+            gameOrg.text = orgName;
+            gameOrg.name = "OrgTitle";
+            gameOrg.AddToClassList("gameButtonOrgTitle");
+            button.Add(gameOrg);
+
+            button.clickable.clickedWithEventInfo += OnGameSelected;
+            
+            if (gameSelectorList != null) gameSelectorList.Add(button);
+        }
+
+        void APIKeyTemplate(KeyResponse key)
+        {
+            Button button = new Button();
+            bool isLegacyKey = !(key.api_key.StartsWith("prod_") || key.api_key.StartsWith("dev_"));
+            button.name = key.api_key;
+            
+            Label keyName = new Label();
+            keyName.text = string.IsNullOrEmpty(key.name) ? "Unnamed API Key" : key.name;
+            
+            if (button.name == LootLockerConfig.current.apiKey)
+            {
+                button.style.borderRightColor = button.style.borderLeftColor = 
+                    button.style.borderTopColor = button.style.borderBottomColor = stage;
+                button.style.backgroundColor = new StyleColor(new Color(0.2f, 0.5f, 0.2f, 1f));
+            }
+            
+            if (isLegacyKey)
+            {
+                keyName.text = "Legacy key: " + keyName.text;
+                button.AddToClassList("legacyApikey");
+            }
+            else
+            {
+                button.AddToClassList("apikey");
+                button.clickable.clickedWithEventInfo += OnAPIKeySelected;
+                button.tooltip = "Click to select this API key.";
+            }
+            
+            keyName.AddToClassList("apikeyName");
+            button.Add(keyName);
+            
+            if (apiKeyList != null) apiKeyList.Add(button);
+        }
+
+        void SwapNewSelectedKey()
+        {
+            if (apiKeyList == null) return;
+            
+            foreach (var element in apiKeyList.Children())
+            {
+                var key = element as Button;
+                if (key == null) continue;
+                
+                if (key.name == LootLockerConfig.current.apiKey)
+                {
+                    key.style.borderRightColor = key.style.borderLeftColor = 
+                        key.style.borderTopColor = key.style.borderBottomColor = stage;
+                    key.style.backgroundColor = new StyleColor(new Color(0.2f, 0.5f, 0.2f, 1f));
+                }
+                else
+                {
+                    key.style.backgroundColor = defaultButton;
+                    key.style.borderRightColor = key.style.borderLeftColor = 
+                        key.style.borderTopColor = key.style.borderBottomColor = defaultButton;
+                }
+            }
+        }
+
+        public void UpdateLicenseCountdownUI()
+        {
+            if (licenseCountdownContainer == null || licenseCountdownLabel == null || licenseCountdownIcon == null)
+                return;
+
+            int selectedGameId = LootLockerEditorData.GetSelectedGame();
+            if (!gameData.ContainsKey(selectedGameId))
+            {
+                licenseCountdownContainer.style.display = DisplayStyle.None;
+                return;
+            }
+
+            var game = gameData[selectedGameId];
+            string trialEndDate = game.trial_end_date;
+            if (string.IsNullOrEmpty(trialEndDate))
+            {
+                licenseCountdownContainer.style.display = DisplayStyle.None;
+                return;
+            }
+
+            if (!System.DateTime.TryParse(trialEndDate, out var endDate))
+            {
+                licenseCountdownContainer.style.display = DisplayStyle.None;
+                return;
+            }
+
+            var now = System.DateTime.UtcNow;
+            int daysLeft = (endDate.Date - now.Date).Days;
+
+            UpdateLicenseCountdownDisplay(daysLeft, endDate < now);
+        }
+
+        private void UpdateLicenseCountdownDisplay(int daysLeft, bool isExpired)
+        {
+            if (isExpired || daysLeft == 0)
+            {
+                string labelText = isExpired ? "Trial Expired" : "Trial ends today";
+                SetLicenseCountdownExpired(labelText);
+            }
+            else if (daysLeft > 0 && daysLeft <= 10)
+            {
+                SetLicenseCountdownWarning(daysLeft);
+            }
+            else
+            {
+                licenseCountdownContainer.style.display = DisplayStyle.None;
+            }
+        }
+
+        private void SetLicenseCountdownExpired(string labelText)
+        {
+            licenseCountdownLabel.text = labelText;
+            licenseCountdownLabel.RemoveFromClassList("licenseCountdownLabel");
+            licenseCountdownLabel.RemoveFromClassList("expired");
+            licenseCountdownLabel.AddToClassList("licenseCountdownLabel");
+            licenseCountdownLabel.AddToClassList("expired");
+            licenseCountdownLabel.style.color = new Color(1f, 0.31f, 0.31f);
+            licenseCountdownLabel.style.display = DisplayStyle.Flex;
+            licenseCountdownIcon.image = EditorGUIUtility.IconContent("console.warnicon").image as Texture2D;
+            licenseCountdownIcon.style.display = DisplayStyle.Flex;
+            licenseCountdownContainer.style.display = DisplayStyle.Flex;
+            licenseCountdownContainer.tooltip = "Click to manage your license";
+            licenseCountdownContainer.RegisterCallback<MouseDownEvent>(LicenseCountdownContainerClick);
+        }
+
+        private void SetLicenseCountdownWarning(int daysLeft)
+        {
+            licenseCountdownLabel.text = $"Trial ends in {daysLeft} days";
+            licenseCountdownLabel.RemoveFromClassList("expired");
+            licenseCountdownLabel.AddToClassList("licenseCountdownLabel");
+            licenseCountdownLabel.style.display = DisplayStyle.Flex;
+            licenseCountdownIcon.image = EditorGUIUtility.IconContent("_Help").image as Texture2D;
+            licenseCountdownIcon.style.display = DisplayStyle.Flex;
+            licenseCountdownContainer.style.display = DisplayStyle.Flex;
+            licenseCountdownContainer.tooltip = "Learn more about your license";
+            licenseCountdownContainer.UnregisterCallback<MouseDownEvent>(LicenseCountdownContainerClick);
+            licenseCountdownIcon.RegisterCallback<MouseDownEvent>(LicenseCountdownIconClick);
+        }
+    }
+}
+#endif
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs.meta b/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs.meta
new file mode 100644
index 00000000..6af3c13f
--- /dev/null
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 120d65cc7105a834093352eb173ae022
\ No newline at end of file
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs
new file mode 100644
index 00000000..040a7f24
--- /dev/null
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs	
@@ -0,0 +1,100 @@
+using System;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor;
+
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER && !LOOTLOCKER_DISABLE_EDITOR_EXTENSION
+namespace LootLocker.Extension
+{
+    public partial class LootLockerAdminExtension : EditorWindow
+    {
+        // Settings save methods - now with immediate saving
+        private void SaveGameVersion(string newVersion)
+        {
+            if (!IsSemverString(newVersion))
+            {
+                if (gameVersionWarning != null)
+                {
+                    gameVersionWarning.text = "Game version must be in format X.Y.Z.B (MAJOR.MINOR.PATCH.BUILD, last two optional)";
+                    gameVersionWarning.style.display = DisplayStyle.Flex;
+                }
+                return;
+            }
+            
+            if (gameVersionWarning != null) gameVersionWarning.style.display = DisplayStyle.None;
+            LootLockerConfig.current.game_version = newVersion;
+            SaveConfig();
+        }
+
+        private void SaveLogLevel(LootLockerLogger.LogLevel newLogLevel)
+        {
+            LootLockerConfig.current.logLevel = newLogLevel;
+            SaveConfig();
+        }
+
+        private void SaveLogErrorsAsWarnings(bool newValue)
+        {
+            LootLockerConfig.current.logErrorsAsWarnings = newValue;
+            SaveConfig();
+        }
+
+        private void SaveLogInBuilds(bool newValue)
+        {
+            LootLockerConfig.current.logInBuilds = newValue;
+            SaveConfig();
+        }
+
+        private void SaveAllowTokenRefresh(bool newValue)
+        {
+            LootLockerConfig.current.allowTokenRefresh = newValue;
+            SaveConfig();
+        }
+
+        private void SaveConfig()
+        {
+            EditorUtility.SetDirty(LootLockerConfig.current);
+#if UNITY_EDITOR
+            UnityEditor.AssetDatabase.SaveAssets();
+#endif
+        }        // Loads current LootLockerConfig values into the settings UI
+        public void LoadSettingsUI()
+        {
+            var config = LootLockerConfig.current;
+            
+            if (gameVersionField != null) 
+                gameVersionField.SetValueWithoutNotify(config.game_version);
+            
+            if (logLevelField != null) 
+            {
+                logLevelField.Init(config.logLevel);
+                logLevelField.SetValueWithoutNotify(config.logLevel);
+            }
+            
+            if (logErrorsAsWarningsToggle != null) 
+                logErrorsAsWarningsToggle.SetValueWithoutNotify(config.logErrorsAsWarnings);
+            
+            if (logInBuildsToggle != null) 
+                logInBuildsToggle.SetValueWithoutNotify(config.logInBuilds);
+            
+            if (allowTokenRefreshToggle != null) 
+                allowTokenRefreshToggle.SetValueWithoutNotify(config.allowTokenRefresh);
+            
+            if (gameVersionWarning != null) 
+                gameVersionWarning.style.display = DisplayStyle.None;
+        }
+
+        private static bool IsSemverString(string str)
+        {
+            return System.Text.RegularExpressions.Regex.IsMatch(str,
+                @"^(0|[1-9]\d*)\.(0|[1-9]\d*)(?:\.(0|[1-9]\d*))?(?:\.(0|[1-9]\d*))?$");
+        }
+
+        // Simple flow switching
+        void RequestFlowSwitch(VisualElement targetFlow, System.Action onSuccess = null)
+        {
+            SwapFlows(targetFlow);
+            onSuccess?.Invoke();
+        }
+    }
+}
+#endif
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs.meta b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs.meta
new file mode 100644
index 00000000..1b029795
--- /dev/null
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9654084be2f4bfb48957ad2729f182b9
\ No newline at end of file
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs
new file mode 100644
index 00000000..9979bc53
--- /dev/null
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs	
@@ -0,0 +1,246 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor;
+
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER && !LOOTLOCKER_DISABLE_EDITOR_EXTENSION
+namespace LootLocker.Extension
+{
+    public partial class LootLockerAdminExtension : EditorWindow
+    {
+        public void InitializeUIElements()
+        {
+            VisualElement root = rootVisualElement;
+            VisualElement labelFromUXML = m_VisualTreeAsset.Instantiate();
+
+            var styleLength = new StyleLength();
+            var current = styleLength.value;
+            current.unit = LengthUnit.Percent;
+            current.value = 100;
+            labelFromUXML.style.height = current;
+            root.Add(labelFromUXML);
+
+            CreateSecurityWarning(root);
+            InitializeStyleColors();
+            InitializeUIReferences(root);
+            InitializeEventHandlers();
+            InitializeEnvironmentUI();
+            InitializeLoadingIcon(root);
+            InitializeLicenseCountdownUI(root);
+        }
+
+        private void CreateSecurityWarning(VisualElement root)
+        {
+            securityWarning = new Label("Warning: Do not use on shared or insecure machines, data is stored in EditorPrefs");
+            securityWarning.style.color = new StyleColor(Color.yellow);
+            securityWarning.style.unityFontStyleAndWeight = FontStyle.Bold;
+            securityWarning.style.display = DisplayStyle.None;
+            root.Add(securityWarning);
+        }
+
+        private void InitializeStyleColors()
+        {
+            live.value = new Color(0.749f, 0.325f, 0.098f, 1);
+            stage.value = new Color(0.094f, 0.749f, 0.352f, 1);
+            defaultButton.value = new Color(0.345f, 0.345f, 0.345f, 1);
+        }
+
+        private void InitializeUIReferences(VisualElement root)
+        {
+            // Environment
+            environmentBackground = root.Q<VisualElement>("SwitchBackground");
+            environmentHandle = root.Q<VisualElement>("Handle");
+            environmentElement = root.Q<VisualElement>("Environment");
+            environmentTitle = root.Q<Label>("EnvironmentTitle");
+
+            // Basic UI elements
+            gameName = root.Q<Label>("GameName");
+            menu = root.Q<VisualElement>("MenuBar");
+
+            // Menu buttons
+            menuChangeGameBtn = root.Q<Button>("ChangeGameBtn");
+            menuAPIKeyBtn = root.Q<Button>("APIKeyBtn");
+            menuLogoutBtn = root.Q<Button>("LogoutBtn");
+
+            // Popup elements
+            popup = root.Q<VisualElement>("PopUp");
+            popupTitle = root.Q<Label>("popupTitle");
+            popupMessage = root.Q<Label>("popupMessage");
+            popupBtn = root.Q<Button>("popupCloseBtn");
+
+            // Flow containers
+            loginFlow = root.Q<VisualElement>("LoginFlow");
+            mfaFlow = root.Q<VisualElement>("MFAFlow");
+            gameSelectorFlow = root.Q<VisualElement>("GameSelectorFlow");
+            apiKeyFlow = root.Q<VisualElement>("APIKeyFlow");
+            settingsFlow = root.Q<VisualElement>("SettingsFlow");
+
+            // Login elements
+            emailField = root.Q<TextField>("EmailField");
+            passwordField = root.Q<TextField>("PasswordField");
+            signupLink = root.Q<Label>("newUserLink");
+            gettingStartedLink = root.Q<Label>("gettingStartedLink");
+            forgotPasswordLink = root.Q<Label>("forgotPasswordLink");
+            loginBtn = root.Q<Button>("LoginBtn");
+
+            // MFA elements
+            codeField = root.Q<TextField>("CodeField");
+            signInBtn = root.Q<Button>("SignInBtn");
+
+            // Game selector elements
+            gameSelectorList = root.Q<VisualElement>("GamesList");
+
+            // API Key elements
+            createApiKeyWindow = root.Q<VisualElement>("InfoandCreate");
+            apiKeyList = root.Q<VisualElement>("APIKeyList");
+            newApiKeyWindow = root.Q<VisualElement>("CreateAPIKeyWindow");
+            newApiKeyName = root.Q<TextField>("newApiKeyName");
+            newApiKeyCancel = root.Q<Label>("APINewKeyCancel");
+            createApiKeyBtn = root.Q<Button>("CreateNewKey");
+            createNewApiKeyBtn = root.Q<Button>("CreateKeyBtn");
+
+            // Settings elements
+            settingsBtn = root.Q<Button>("SettingsBtn");
+            settingsBackBtn = root.Q<Button>("SettingsBackBtn");
+            gameVersionField = root.Q<TextField>("GameVersionField");
+            gameVersionWarning = root.Q<Label>("GameVersionWarning");
+            logLevelField = root.Q<EnumField>("LogLevelField");
+            logErrorsAsWarningsToggle = root.Q<Toggle>("LogErrorsAsWarningsToggle");
+            logInBuildsToggle = root.Q<Toggle>("LogInBuildsToggle");
+            allowTokenRefreshToggle = root.Q<Toggle>("AllowTokenRefreshToggle");
+
+            // Set initial display states
+            SetInitialDisplayStates();
+        }
+
+        private void SetInitialDisplayStates()
+        {
+            if (menuLogoutBtn != null) menuLogoutBtn.style.display = DisplayStyle.None;
+            if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
+            if (menu != null) menu.style.display = DisplayStyle.None;
+            if (loginFlow != null) loginFlow.style.display = DisplayStyle.None;
+            if (mfaFlow != null) mfaFlow.style.display = DisplayStyle.None;
+            if (gameSelectorFlow != null) gameSelectorFlow.style.display = DisplayStyle.None;
+            if (apiKeyFlow != null) apiKeyFlow.style.display = DisplayStyle.None;
+            if (settingsFlow != null) settingsFlow.style.display = DisplayStyle.None;
+            if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
+        }
+
+        private void InitializeEventHandlers()
+        {
+            // Environment switcher
+            if (environmentBackground != null) environmentBackground.AddManipulator(new Clickable(evt => SwapEnvironment()));
+            if (environmentHandle != null) environmentHandle.AddManipulator(new Clickable(evt => SwapEnvironment()));
+
+            // Menu buttons
+            if (menuLogoutBtn != null) menuLogoutBtn.clickable.clicked += ConfirmLogout;
+            if (menuChangeGameBtn != null) menuChangeGameBtn.clickable.clicked += () => RequestFlowSwitch(gameSelectorFlow);
+            if (menuAPIKeyBtn != null) menuAPIKeyBtn.clickable.clicked += () => RequestFlowSwitch(apiKeyFlow);
+
+            // Popup
+            if (popupBtn != null) popupBtn.clickable.clickedWithEventInfo += ClosePopup;
+
+            // Login
+            if (passwordField != null) passwordField.RegisterCallback<KeyDownEvent>(OnPasswordKeyDown);
+            if (signupLink != null) signupLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://lootlocker.com/sign-up"));
+            if (forgotPasswordLink != null) forgotPasswordLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://console.lootlocker.com/forgot-password"));
+            if (gettingStartedLink != null) gettingStartedLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://docs.lootlocker.com/the-basics/readme"));
+            if (loginBtn != null) loginBtn.clickable.clicked += Login;
+
+            // MFA
+            if (signInBtn != null) signInBtn.clickable.clickedWithEventInfo += SignIn;
+
+            // API Key creation
+            if (newApiKeyCancel != null) newApiKeyCancel.RegisterCallback<MouseDownEvent>(OnNewApiKeyCancelClick);
+            if (createApiKeyBtn != null) createApiKeyBtn.clickable.clicked += OnCreateApiKeyClick;
+            if (createNewApiKeyBtn != null) createNewApiKeyBtn.clickable.clicked += OnCreateNewApiKeyClick;
+
+            // Settings
+            if (settingsBtn != null) settingsBtn.clickable.clicked += OnSettingsClick;
+            if (settingsBackBtn != null) settingsBackBtn.clickable.clicked += OnSettingsBackClick;
+
+            // Settings value change handlers
+            InitializeSettingsEventHandlers();
+        }
+
+        private void InitializeSettingsEventHandlers()
+        {
+            if (gameVersionField != null) gameVersionField.RegisterValueChangedCallback(evt => SaveGameVersion(evt.newValue));
+            if (logLevelField != null) logLevelField.RegisterValueChangedCallback(evt => SaveLogLevel((LootLockerLogger.LogLevel)evt.newValue));
+            if (logErrorsAsWarningsToggle != null) logErrorsAsWarningsToggle.RegisterValueChangedCallback(evt => SaveLogErrorsAsWarnings(evt.newValue));
+            if (logInBuildsToggle != null) logInBuildsToggle.RegisterValueChangedCallback(evt => SaveLogInBuilds(evt.newValue));
+            if (allowTokenRefreshToggle != null) allowTokenRefreshToggle.RegisterValueChangedCallback(evt => SaveAllowTokenRefresh(evt.newValue));
+        }
+
+        private void InitializeEnvironmentUI()
+        {
+            if (environmentBackground != null) environmentBackground.tooltip = "Stage";
+            
+            isStage = LootLockerEditorData.IsEnvironmentStage();
+            UpdateEnvironmentUI();
+        }
+
+        private void InitializeLoadingIcon(VisualElement root)
+        {
+            loadingPage = root.Q<VisualElement>("LoadingBackground");
+            if (loadingPage != null) loadingPage.style.display = DisplayStyle.Flex;
+            currentFlow = loadingPage;
+
+            loadingIcon = root.Q<VisualElement>("LoadingIcon");
+            if (loadingIcon != null)
+            {
+                loadingIcon.schedule.Execute(() =>
+                {
+                    if (rotateIndex >= 360) rotateIndex = 0;
+                    rotateIndex += 1;
+                    EditorApplication.update += OnEditorUpdate;
+                    loadingIcon.style.rotate = new StyleRotate(new Rotate(new Angle(rotateIndex, AngleUnit.Degree)));
+                    EditorApplication.update -= OnEditorUpdate;
+                }).Every(16); // 60 FPS
+            }
+        }
+
+        private void InitializeLicenseCountdownUI(VisualElement root)
+        {
+            licenseCountdownContainer = root.Q<VisualElement>("LicenseCountdownContainer");
+            licenseCountdownLabel = root.Q<Label>("LicenseCountdownLabel");
+            licenseCountdownIcon = root.Q<Image>("LicenseCountdownIcon");
+            if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
+        }
+
+        public void UpdateEnvironmentUI()
+        {
+            if (isStage)
+            {
+                if (environmentHandle != null) environmentHandle.style.alignSelf = Align.FlexStart;
+                if (environmentBackground != null) environmentBackground.style.backgroundColor = stage;
+                if (environmentTitle != null) environmentTitle.text = "Environment: Stage";
+            }
+            else
+            {
+                if (environmentHandle != null) environmentHandle.style.alignSelf = Align.FlexEnd;
+                if (environmentBackground != null) environmentBackground.style.backgroundColor = live;
+                if (environmentTitle != null) environmentTitle.text = "Environment: Live";
+            }
+        }
+
+        public void SetupSettingsButton()
+        {
+            if (settingsBtn != null)
+            {
+                var settingsIcon = EditorGUIUtility.IconContent("SettingsIcon");
+                if (settingsIcon?.image != null)
+                {
+                    settingsBtn.style.backgroundImage = new StyleBackground(settingsIcon.image as Texture2D);
+                }
+            }
+        }        // Helper for menu visibility
+        public void SetMenuVisibility(bool apiKey, bool changeGame, bool logout)
+        {
+            if (menu != null) menu.style.display = DisplayStyle.Flex;
+            if (menuAPIKeyBtn != null) menuAPIKeyBtn.style.display = apiKey ? DisplayStyle.Flex : DisplayStyle.None;
+            if (menuChangeGameBtn != null) menuChangeGameBtn.style.display = changeGame ? DisplayStyle.Flex : DisplayStyle.None;
+            if (menuLogoutBtn != null) menuLogoutBtn.style.display = logout ? DisplayStyle.Flex : DisplayStyle.None;
+        }
+    }
+}
+#endif
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs.meta b/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs.meta
new file mode 100644
index 00000000..15d0fb4d
--- /dev/null
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 76afc7e66c99712419d65d8513f82683
\ No newline at end of file
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs
index ff6b336f..82c9ee93 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
@@ -9,47 +9,58 @@
 
 namespace LootLocker.Extension
 {
-    public class LootLockerAdminExtension : EditorWindow
+    public partial class LootLockerAdminExtension : EditorWindow
     {
-        // State Variables
-        bool isStage = true;
-        bool isLoadingKeys = false;
-        Dictionary<int, LootLocker.Extension.DataTypes.Game> gameData = new Dictionary<int, LootLocker.Extension.DataTypes.Game>();
-        private Label gameName;        DateTime gameDataRefreshTime;
-        readonly int gameDataCacheExpirationTimeMinutes = 1;
+        #region State Variables
+        private bool isStage = true;
+        private bool isLoadingKeys = false;
+        private Dictionary<int, LootLocker.Extension.DataTypes.Game> gameData = new Dictionary<int, LootLocker.Extension.DataTypes.Game>();
+        private DateTime gameDataRefreshTime;
+        private readonly int gameDataCacheExpirationTimeMinutes = 1;
         private VisualElement currentFlow = null;
-        private VisualElement previousFlow = null; // Track previous flow for back button
+        private VisualElement previousFlow = null;
+        private string mfaKey;
+        private int rotateIndex = 0;
+        #endregion
 
+        #region Serialized Fields
         [SerializeField]
         private VisualTreeAsset m_VisualTreeAsset = default;
+        #endregion
 
+        #region Style Colors
         [Header("Colors")]
-        StyleColor stage;
-        StyleColor live;
-        StyleColor defaultButton;
-
+        private StyleColor stage;
+        private StyleColor live;
+        private StyleColor defaultButton;
+        #endregion
+
+        #region UI Element References
+        // Basic UI elements
+        private Label gameName;
+        private Label securityWarning;
 
-        [Header("Environment")]
+        // Environment
         private VisualElement environmentBackground, environmentHandle;
         private VisualElement environmentElement;
         private Label environmentTitle;
 
-        [Header("Flows")]
+        // Flows
         private VisualElement activeFlow;
         private VisualElement loginFlow, mfaFlow, gameSelectorFlow, apiKeyFlow, settingsFlow;
 
-        [Header("Menu")]
+        // Menu
         private VisualElement menu;
         private Button menuAPIKeyBtn;
         private Button menuChangeGameBtn;
         private Button menuLogoutBtn;
 
-        [Header("Popup")]
+        // Popup
         private VisualElement popup;
         private Label popupTitle, popupMessage;
         private Button popupBtn;
 
-        [Header("API Key")]
+        // API Key
         private Label newApiKeyCancel;
         private VisualElement newApiKeyWindow;
         private TextField newApiKeyName;
@@ -58,31 +69,37 @@ public class LootLockerAdminExtension : EditorWindow
         private Button createApiKeyBtn;
         private VisualElement apiKeyList;
 
-        [Header("Login UI")]
+        // Login UI
         private TextField emailField, passwordField;
         private Label signupLink, gettingStartedLink, forgotPasswordLink;
         private Button loginBtn;
 
-        [Header("MFA UI")]
+        // MFA UI
         private TextField codeField;
         private Button signInBtn;
-        private string mfaKey;
-
-        [Header("Game Selector UI")]
-        VisualElement gameSelectorList;
 
-        [Header("Loading Icon")]
-        VisualElement loadingPage;
-        VisualElement loadingIcon;
-        int rotateIndex = 0;
+        // Game Selector UI
+        private VisualElement gameSelectorList;
 
-        private Label securityWarning;
+        // Loading Icon
+        private VisualElement loadingPage;
+        private VisualElement loadingIcon;
 
         // License Countdown UI
         private VisualElement licenseCountdownContainer;
         private Label licenseCountdownLabel;
         private Image licenseCountdownIcon;
 
+        // Settings UI
+        private Button settingsBtn;
+        private Button settingsBackBtn;
+        private TextField gameVersionField;
+        private Label gameVersionWarning;
+        private EnumField logLevelField;
+        private Toggle logErrorsAsWarningsToggle, logInBuildsToggle, allowTokenRefreshToggle;
+        #endregion
+
+        #region Window Management
         [MenuItem("Window/LootLocker")]
         public static void Run()
         {
@@ -100,7 +117,6 @@ public static void Run()
                         return;
                     }
                     wnd.SwapFlows(wnd.gameSelectorFlow);
-
                 });
                 return;
             }
@@ -113,258 +129,26 @@ public static void LoadFirstTime()
         {
             if (LootLockerEditorData.ShouldAutoShowWindow())
             {
-                EditorApplication.delayCall = (EditorApplication.CallbackFunction)Delegate.Combine(EditorApplication.delayCall, (EditorApplication.CallbackFunction)delegate
-                {
-                    LootLockerAdminExtension wnd = GetWindow<LootLockerAdminExtension>();
-                    wnd.titleContent = new GUIContent("LootLocker");
-                    wnd.ShowUtility();
-                });
-
-                return;
+                EditorApplication.delayCall = (EditorApplication.CallbackFunction)Delegate.Combine(
+                    EditorApplication.delayCall, 
+                    (EditorApplication.CallbackFunction)delegate
+                    {
+                        LootLockerAdminExtension wnd = GetWindow<LootLockerAdminExtension>();
+                        wnd.titleContent = new GUIContent("LootLocker");
+                        wnd.ShowUtility();
+                    });
             }
-
         }
 
         public void CreateGUI()
         {
-            VisualElement root = rootVisualElement;
-
-            VisualElement labelFromUXML = m_VisualTreeAsset.Instantiate();
-
-            var styleLength = new StyleLength();
-            var current = styleLength.value;
-            current.unit = LengthUnit.Percent;
-            current.value = 100;
-            labelFromUXML.style.height = current;
-            root.Add(labelFromUXML);
-
-            securityWarning = new Label("Warning: Do not use on shared or insecure machines, data is stored in EditorPrefs");
-            securityWarning.style.color = new StyleColor(Color.yellow);
-            securityWarning.style.unityFontStyleAndWeight = FontStyle.Bold;
-            securityWarning.style.display = DisplayStyle.None; // Hide by default
-            root.Add(securityWarning);
-
-            live.value = new Color(0.749f, 0.325f, 0.098f, 1);
-            stage.value = new Color(0.094f, 0.749f, 0.352f, 1);
-            defaultButton.value = new Color(0.345f, 0.345f, 0.345f, 1);
-
-            // Null checks for all Q<T>() calls
-            menuLogoutBtn = root.Q<Button>("LogoutBtn");
-            if (menuLogoutBtn == null) Debug.LogWarning("LogoutBtn not found in UXML");
-            else menuLogoutBtn.style.display = DisplayStyle.None;
-
-            environmentBackground = root.Q<VisualElement>("SwitchBackground");
-            if (environmentBackground == null) Debug.LogWarning("SwitchBackground not found in UXML");
-            else environmentBackground.AddManipulator(new Clickable(evt => SwapEnvironment()));
-
-            environmentHandle = root.Q<VisualElement>("Handle");
-            if (environmentHandle == null) Debug.LogWarning("Handle not found in UXML");
-            else environmentHandle.AddManipulator(new Clickable(evt => SwapEnvironment()));
-
-            if (environmentBackground != null) environmentBackground.tooltip = "Stage";
-
-            environmentElement = root.Q<VisualElement>("Environment");
-            if (environmentElement == null) Debug.LogWarning("Environment not found in UXML");
-            else environmentElement.style.display = DisplayStyle.None;
-
-            environmentTitle = root.Q<Label>("EnvironmentTitle");
-            if (environmentTitle == null) Debug.LogWarning("EnvironmentTitle not found in UXML");
-
-            gameName = root.Q<Label>("GameName");
-            if (gameName == null) Debug.LogWarning("GameName not found in UXML");
-
-            menu = root.Q<VisualElement>("MenuBar");
-            if (menu == null) Debug.LogWarning("MenuBar not found in UXML");
-            else menu.style.display = DisplayStyle.None;
-
-            menuChangeGameBtn = root.Q<Button>("ChangeGameBtn");
-            if (menuChangeGameBtn == null) Debug.LogWarning("ChangeGameBtn not found in UXML");
-
-            menuAPIKeyBtn = root.Q<Button>("APIKeyBtn");
-            if (menuAPIKeyBtn == null) Debug.LogWarning("APIKeyBtn not found in UXML");
-
-            menuLogoutBtn = root.Q<Button>("LogoutBtn");
-            if (menuLogoutBtn != null)
-                menuLogoutBtn.clickable.clicked += () => { ConfirmLogout(); };
-            if (menuChangeGameBtn != null) menuChangeGameBtn.clickable.clicked += () => { RequestFlowSwitch(gameSelectorFlow); };
-
-            if (menuAPIKeyBtn != null) menuAPIKeyBtn.clickable.clicked += () => { RequestFlowSwitch(apiKeyFlow); };
-
-            popup = root.Q<VisualElement>("PopUp");
-            if (popup == null) Debug.LogWarning("PopUp not found in UXML");
-
-            popupTitle = root.Q<Label>("popupTitle");
-            popupMessage = root.Q<Label>("popupMessage");
-            popupBtn = root.Q<Button>("popupCloseBtn");
-            if (popupBtn != null) popupBtn.clickable.clickedWithEventInfo += ClosePopup;
-
-            loginFlow = root.Q<VisualElement>("LoginFlow");
-            if (loginFlow == null) Debug.LogWarning("LoginFlow not found in UXML");
-            else loginFlow.style.display = DisplayStyle.None;
-
-            emailField = root.Q<TextField>("EmailField");
-            passwordField = root.Q<TextField>("PasswordField");
-            if (passwordField != null)
-            {
-                passwordField.RegisterCallback<KeyDownEvent>((evt) =>
-                {
-                    if (evt.keyCode == KeyCode.Return)
-                    {
-                        Login();
-                    }
-                });
-            }
-
-            signupLink = root.Q<Label>("newUserLink");
-            gettingStartedLink = root.Q<Label>("gettingStartedLink");
-            forgotPasswordLink = root.Q<Label>("forgotPasswordLink");
-            loginBtn = root.Q<Button>("LoginBtn");
-            if (signupLink != null) signupLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://lootlocker.com/sign-up"));
-            if (forgotPasswordLink != null) forgotPasswordLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://console.lootlocker.com/forgot-password"));
-            if (gettingStartedLink != null) gettingStartedLink.RegisterCallback<MouseDownEvent>(_ => Application.OpenURL("https://docs.lootlocker.com/the-basics/readme"));
-            if (loginBtn != null) loginBtn.clickable.clicked += Login;
-
-            mfaFlow = root.Q<VisualElement>("MFAFlow");
-            codeField = root.Q<TextField>("CodeField");
-            signInBtn = root.Q<Button>("SignInBtn");
-            if (signInBtn != null) signInBtn.clickable.clickedWithEventInfo += SignIn;
-            if (mfaFlow != null) mfaFlow.style.display = DisplayStyle.None;
-
-            gameSelectorFlow = root.Q<VisualElement>("GameSelectorFlow");
-            gameSelectorList = root.Q<VisualElement>("GamesList");
-            if (gameSelectorFlow != null) gameSelectorFlow.style.display = DisplayStyle.None;
-
-            apiKeyFlow = root.Q<VisualElement>("APIKeyFlow");
-            if (apiKeyFlow != null) apiKeyFlow.style.display = DisplayStyle.None;
-
-            createApiKeyWindow = root.Q<VisualElement>("InfoandCreate");
-            if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
-
-            apiKeyList = root.Q<VisualElement>("APIKeyList");
-            newApiKeyWindow = root.Q<VisualElement>("CreateAPIKeyWindow");
-            newApiKeyName = root.Q<TextField>("newApiKeyName");
-            newApiKeyCancel = root.Q<Label>("APINewKeyCancel");
-            if (newApiKeyCancel != null)
-                newApiKeyCancel.RegisterCallback<MouseDownEvent>(_ =>
-                {
-                    if (newApiKeyName != null) newApiKeyName.value = "";
-                    if (newApiKeyWindow != null) newApiKeyWindow.style.display = DisplayStyle.None;
-                });
-
-            createApiKeyBtn = root.Q<Button>("CreateNewKey");
-            if (createApiKeyBtn != null)
-                createApiKeyBtn.clickable.clicked += () =>
-                {
-                    CreateNewAPIKey();
-                    if (newApiKeyWindow != null) newApiKeyWindow.style.display = DisplayStyle.None;
-                };
-
-            createNewApiKeyBtn = root.Q<Button>("CreateKeyBtn");
-            if (createNewApiKeyBtn != null)
-                createNewApiKeyBtn.clickable.clicked += () =>
-                {
-                    if (newApiKeyWindow != null) newApiKeyWindow.style.display = DisplayStyle.Flex;
-                };            // Settings UI
-            settingsFlow = root.Q<VisualElement>("SettingsFlow");
-            settingsBtn = root.Q<Button>("SettingsBtn");
-            settingsBackBtn = root.Q<Button>("SettingsBackBtn");
-            // Save/Cancel buttons no longer needed - settings save immediately
-            gameVersionField = root.Q<TextField>("GameVersionField");
-            gameVersionWarning = root.Q<Label>("GameVersionWarning");
-            logLevelField = root.Q<EnumField>("LogLevelField");
-            logErrorsAsWarningsToggle = root.Q<Toggle>("LogErrorsAsWarningsToggle");
-            logInBuildsToggle = root.Q<Toggle>("LogInBuildsToggle");
-            allowTokenRefreshToggle = root.Q<Toggle>("AllowTokenRefreshToggle");            // Set up immediate save callbacks (only once during initialization)
-            if (gameVersionField != null) gameVersionField.RegisterValueChangedCallback(evt => { 
-                SaveGameVersion(evt.newValue); 
-            });
-            if (logLevelField != null) logLevelField.RegisterValueChangedCallback(evt => { 
-                SaveLogLevel((LootLockerLogger.LogLevel)evt.newValue); 
-            });            if (logErrorsAsWarningsToggle != null) logErrorsAsWarningsToggle.RegisterValueChangedCallback(evt => { 
-                SaveLogErrorsAsWarnings(evt.newValue); 
-            });
-            if (logInBuildsToggle != null) logInBuildsToggle.RegisterValueChangedCallback(evt => { 
-                SaveLogInBuilds(evt.newValue); 
-            });
-            if (allowTokenRefreshToggle != null) allowTokenRefreshToggle.RegisterValueChangedCallback(evt => { 
-                SaveAllowTokenRefresh(evt.newValue); 
-            });
-              if (settingsBtn != null) 
-            {
-                settingsBtn.clickable.clicked += () => { 
-                    previousFlow = currentFlow; // Store current flow before switching
-                    RequestFlowSwitch(settingsFlow, LoadSettingsUI); 
-                };
-                // Set the Unity built-in settings icon
-                var settingsIcon = EditorGUIUtility.IconContent("SettingsIcon");
-                if (settingsIcon != null && settingsIcon.image != null)
-                {
-                    settingsBtn.style.backgroundImage = new StyleBackground(settingsIcon.image as Texture2D);
-                }
-            }
-            
-            // Settings back button
-            if (settingsBackBtn != null)
-            {
-                settingsBackBtn.clickable.clicked += () => {
-                    if (previousFlow != null)
-                    {
-                        RequestFlowSwitch(previousFlow);
-                        previousFlow = null; // Clear previous flow after going back
-                    }
-                    else
-                    {
-                        // Default to API Keys if no previous flow
-                        RequestFlowSwitch(apiKeyFlow);
-                    }
-                };
-            }            // Save/Cancel buttons no longer needed - settings save immediately
-            if (settingsFlow != null) settingsFlow.style.display = DisplayStyle.None;
-            // Settings button will be shown when user is authenticated
-
-            isStage = LootLockerEditorData.IsEnvironmentStage();
-            if (isStage)
-            {
-                if (environmentHandle != null) environmentHandle.style.alignSelf = Align.FlexStart;
-                if (environmentBackground != null) environmentBackground.style.backgroundColor = stage;
-                if (environmentTitle != null) environmentTitle.text = "Environment: Stage";
-            }
-            else
-            {
-                if (environmentHandle != null) environmentHandle.style.alignSelf = Align.FlexEnd;
-                if (environmentBackground != null) environmentBackground.style.backgroundColor = live;
-                if (environmentTitle != null) environmentTitle.text = "Environment: Live";
-            }
-
-            loadingPage = root.Q<VisualElement>("LoadingBackground");
-            if (loadingPage != null) loadingPage.style.display = DisplayStyle.Flex;
-            currentFlow = loadingPage;
-
-            loadingIcon = root.Q<VisualElement>("LoadingIcon");
-            if (loadingIcon != null)
-            {
-                loadingIcon.schedule.Execute(() =>
-                {
-                    if (rotateIndex >= 360)
-                    {
-                        rotateIndex = 0;
-                    }
-                    rotateIndex += 1;
-                    EditorApplication.update += OnEditorUpdate;
-                    loadingIcon.style.rotate = new StyleRotate(new Rotate(new Angle(rotateIndex, AngleUnit.Degree)));
-                    EditorApplication.update -= OnEditorUpdate;
-                }).Every(16); // 60 FPS
-            }
-
-            // License Countdown UI
-            licenseCountdownContainer = root.Q<VisualElement>("LicenseCountdownContainer");
-            licenseCountdownLabel = root.Q<Label>("LicenseCountdownLabel");
-            licenseCountdownIcon = root.Q<Image>("LicenseCountdownIcon");
-            if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
-
+            InitializeUIElements();
+            SetupSettingsButton();
             Run();
         }
+        #endregion
 
+        #region Flow Management
         private bool IsStageOnlyGame()
         {
             int selectedGameId = LootLockerEditorData.GetSelectedGame();
@@ -373,690 +157,152 @@ private bool IsStageOnlyGame()
             if (game.created_at == default(System.DateTime) || game.created_at == null) return false;
             var cutoff = new System.DateTime(2025, 3, 10);
             return game.created_at >= cutoff;
-        }
-
-        void SwapEnvironment()
+        }        void SwapEnvironment()
         {
             if (isLoadingKeys)
             {
-                ShowPopup("Error", "Please wait...");
-                loadingPage.style.display = DisplayStyle.None;
+                if (popup != null && popupTitle != null && popupMessage != null)
+                {
+                    popupTitle.text = "Error";
+                    popupMessage.text = "Please wait...";
+                    popup.style.display = DisplayStyle.Flex;
+                }
+                if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
                 return;
             }
 
             isStage = !isStage;
-
             RefreshAPIKeys();
 
             if (isStage)
             {
                 LootLockerEditorData.SetEnvironmentStage();
-                environmentHandle.style.alignSelf = Align.FlexStart;
-                environmentBackground.style.backgroundColor = stage;
-                environmentTitle.text = "Environment: Stage";
             }
             else
             {
                 LootLockerEditorData.SetEnvironmentLive();
-                environmentHandle.style.alignSelf = Align.FlexEnd;
-                environmentBackground.style.backgroundColor = live;
-                environmentTitle.text = "Environment: Live";
             }
+
+            UpdateEnvironmentUI();
         }
 
-        void SwapFlows(VisualElement New)
+        void SwapFlows(VisualElement newFlow)
         {
-            if (currentFlow == New) return;
-            activeFlow = New;
+            if (currentFlow == newFlow) return;
+            
+            activeFlow = newFlow;
+            
             if (currentFlow != null)
             {
                 currentFlow.style.display = DisplayStyle.None;
-                if (currentFlow == apiKeyFlow)
+                if (currentFlow == apiKeyFlow && apiKeyList != null)
                 {
-                    apiKeyList?.Clear();
+                    apiKeyList.Clear();
                 }
             }
-            New.style.display = DisplayStyle.Flex;
-            if (securityWarning != null) securityWarning.style.display = DisplayStyle.None;            if (activeFlow == gameSelectorFlow)
-            {
-                if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
-                if (gameName != null) gameName.text = "LootLocker";
-                if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.None;
-                // Remove hardcoded credentials
-                if (emailField != null) emailField.value = "";
-                if (passwordField != null) passwordField.value = "";
-                SetMenuVisibility(apiKey: false, changeGame: false, logout: true);
-                if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
-                if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
-                CreateGameButtons();
-            }if (activeFlow == apiKeyFlow)
-            {
-                if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.Flex;
-                if (gameName != null) gameName.text = LootLockerEditorData.GetSelectedGameName();
-                UpdateLicenseCountdownUI();
-                SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
-                if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.Flex;
-                  // Show environment switcher only for non-stage-only games
-                if (environmentElement != null && environmentBackground != null && environmentHandle != null && environmentTitle != null)
-                {
-                    if (!IsStageOnlyGame())
-                    {
-                        environmentElement.style.display = DisplayStyle.Flex;
-                        environmentBackground.style.display = DisplayStyle.Flex;
-                        environmentHandle.style.display = DisplayStyle.Flex;
-                    }
-                    else
-                    {
-                        environmentElement.style.display = DisplayStyle.None;
-                    }
-                }
-                RefreshAPIKeys();
-            }
-            if (activeFlow == settingsFlow)
-            {
-                if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.Flex;
-                if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
-                SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
-                if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
-                if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
-                LoadSettingsUI();
-            }
-            if (activeFlow == loginFlow)
-            {
-                if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
-                if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.None;
-                if (menu != null) menu.style.display = DisplayStyle.None;
-                if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
-                if (securityWarning != null) securityWarning.style.display = DisplayStyle.Flex;
-            }
-            if (activeFlow == mfaFlow)
-            {
-                if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.None;
-                SetMenuVisibility(apiKey: false, changeGame: false, logout: true);
-            }
-            currentFlow = New;
-        }
-        // Helper for menu visibility
-        void SetMenuVisibility(bool apiKey, bool changeGame, bool logout)
-        {
-            if (menu != null) menu.style.display = DisplayStyle.Flex;
-            if (menuAPIKeyBtn != null) menuAPIKeyBtn.style.display = apiKey ? DisplayStyle.Flex : DisplayStyle.None;
-            if (menuChangeGameBtn != null) menuChangeGameBtn.style.display = changeGame ? DisplayStyle.Flex : DisplayStyle.None;
-            if (menuLogoutBtn != null) menuLogoutBtn.style.display = logout ? DisplayStyle.Flex : DisplayStyle.None;
-        }
-
-        private void OnEditorUpdate()
-        {
-            EditorApplication.QueuePlayerLoopUpdate();
-        }
-
-        private void ShowPopup(string title, string message)
-        {
-            popupTitle.text = title;
-            popupMessage.text = message;
 
-            popup.style.display = DisplayStyle.Flex;
+            newFlow.style.display = DisplayStyle.Flex;
+            
+            ConfigureFlowUI(newFlow);
+            
+            currentFlow = newFlow;
         }
 
-        private void ClosePopup(EventBase e)
+        private void ConfigureFlowUI(VisualElement flow)
         {
-            popup.style.display = DisplayStyle.None;
-        }
+            // Hide security warning by default
+            if (securityWarning != null) securityWarning.style.display = DisplayStyle.None;
 
-        public void Login()
-        {
-            if (string.IsNullOrEmpty(emailField?.value) || string.IsNullOrEmpty(passwordField?.value))
+            if (flow == gameSelectorFlow)
             {
-                ShowPopup("Error", "Email or Password is empty.");
-                if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
-                return;
+                ConfigureGameSelectorFlow();
             }
-            EditorApplication.update += OnEditorUpdate;
-            if (loadingPage != null) loadingPage.style.display = DisplayStyle.Flex;
-            try
+            else if (flow == apiKeyFlow)
             {
-                LootLockerAdminManager.AdminLogin(emailField.value, passwordField.value, (onComplete) =>
-                {
-                    if (!onComplete.success)
-                    {
-                        string errorMsg = !string.IsNullOrEmpty(onComplete.errorData?.message) ? onComplete.errorData.message : "We couldn't recognize your information or there is no user with this email, please check and try again!";
-                        ShowPopup("Error", errorMsg);
-                        if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
-                        return;
-                    }
-                    if (onComplete.mfa_key != null)
-                    {
-                        mfaKey = onComplete.mfa_key;
-                        if (menu != null) menu.style.display = DisplayStyle.Flex;
-                        if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
-                        SwapFlows(mfaFlow);
-                    }
-                    else
-                    {
-                        if (menu != null) menu.style.display = DisplayStyle.Flex;
-                        LootLockerConfig.current.adminToken = onComplete.auth_token;
-                        LootLockerEditorData.SetAdminToken(onComplete.auth_token);
-                        if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
-                        SwapFlows(gameSelectorFlow);
-                    }
-                    if (menuLogoutBtn != null) menuLogoutBtn.style.display = DisplayStyle.Flex;
-                    EditorApplication.update -= OnEditorUpdate;
-                });
+                ConfigureApiKeyFlow();
             }
-            catch (Exception ex)
+            else if (flow == settingsFlow)
             {
-                ShowPopup("Error", $"Unexpected error: {ex.Message}");
-                if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
+                ConfigureSettingsFlow();
             }
-        }
-
-        public void SignIn(EventBase e)
-        {
-            EditorApplication.update += OnEditorUpdate;
-            loadingPage.style.display = DisplayStyle.Flex;
-            LootLockerAdminManager.MFAAuthenticate(mfaKey, codeField.value, (onComplete) =>
-            {
-                if (!onComplete.success)
-                {
-                    ShowPopup("Error", "Could not authenticate MFA!");
-                    loadingPage.style.display = DisplayStyle.None;
-                }
-
-                LootLockerConfig.current.adminToken = onComplete.auth_token;
-                LootLockerEditorData.SetAdminToken(onComplete.auth_token);
-                string projectPrefix = PlayerSettings.productGUID.ToString();
-
-                SwapFlows(gameSelectorFlow);
-
-                EditorApplication.update -= OnEditorUpdate;
-                loadingPage.style.display = DisplayStyle.None;
-
-            });
-        }
-
-        public void RefreshUserInformation(Action onComplete)
-        {
-            EditorApplication.update += OnEditorUpdate;
-            loadingPage.style.display = DisplayStyle.Flex;
-
-            LootLockerAdminManager.GetUserInformation((response) =>
+            else if (flow == loginFlow)
             {
-                if (!response.success)
-                {
-                    ShowPopup("Error", "Your token has expired, will redirect you to Login page now!");
-                    Debug.Log(response.errorData.message);
-                    loadingPage.style.display = DisplayStyle.None;
-                    Logout();
-                    return;
-                }
-                gameData.Clear();
-
-                foreach (var org in response.user.organisations)
-                {
-                    foreach (var game in org.games)
-                    {
-                        if (game.id == LootLockerEditorData.GetSelectedGame() || game.development.id == LootLockerEditorData.GetSelectedGame())
-                        {
-                            LootLockerEditorData.SetSelectedGameName(game.name);
-                        }
-                        game.organisation_name = org.name;
-                        gameData.Add(game.id, game);
-                    }
-                }
-                UpdateLicenseCountdownUI();
-
-                gameDataRefreshTime = DateTime.Now;
-
-                onComplete();
-
-                EditorApplication.update -= OnEditorUpdate;
-                loadingPage.style.display = DisplayStyle.None;
-
-            });
-        }
-
-        public void CreateGameButtons()
-        {
-            gameSelectorList.Clear();
-
-            var action = new Action(() =>
-            {
-
-                foreach (var game in gameData.Values)
-                {
-                    GameButtonTemplate(game, game.organisation_name);
-                }
-            });
-
-            if (gameDataRefreshTime == null || DateTime.Now >= gameDataRefreshTime.AddMinutes(gameDataCacheExpirationTimeMinutes) || LootLockerEditorData.IsNewSession())
-            {
-                RefreshUserInformation(action);
-
+                ConfigureLoginFlow();
             }
-            else
+            else if (flow == mfaFlow)
             {
-                action();
+                ConfigureMfaFlow();
             }
         }
 
-        public void GameButtonTemplate(LootLocker.Extension.DataTypes.Game game, string orgName)
+        private void ConfigureGameSelectorFlow()
         {
-            Button button = new Button();
-
-            button.style.flexDirection = FlexDirection.Column;
-            button.name = game.id.ToString();
-
-            button.AddToClassList("gameButton");
-
-            Label gameTitle = new Label();
-            gameTitle.text = game.name;
-            gameTitle.name = "GameTitle";
-
-            gameTitle.AddToClassList("gameButtonTitle");
-
-            button.Add(gameTitle);
-
-            Label gameOrg = new Label();
-            gameOrg.text = orgName;
-            gameOrg.name = "OrgTitle";
-
-            gameOrg.AddToClassList("gameButtonOrgTitle");
-
-            button.Add(gameOrg);
-
-            button.clickable.clickedWithEventInfo += OnGameSelected;
-
-            gameSelectorList.Add(button);
-        }
-
-        bool AtTarget(EventBase eventBase)
-        {
-#if UNITY_2023_1_OR_NEWER
-            if(eventBase.propagationPhase == PropagationPhase.BubbleUp) 
-                return true;
-#else
-            if(eventBase.propagationPhase == PropagationPhase.AtTarget) 
-                return true;
-#endif
-            return false;
+            if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
+            if (gameName != null) gameName.text = "LootLocker";
+            if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.None;
+            if (emailField != null) emailField.value = "";
+            if (passwordField != null) passwordField.value = "";
+            SetMenuVisibility(apiKey: false, changeGame: false, logout: true);
+            if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
+            if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
+            CreateGameButtons();
         }
 
-        void OnGameSelected(EventBase e)
+        private void ConfigureApiKeyFlow()
         {
-            if (!AtTarget(e))
-                return;
-
-            var target = e.target as Button;
-
-            LootLockerEditorData.SetSelectedGame(target.name);
-            var selectedGameData = gameData[int.Parse(target.name)];
-
-            LootLockerEditorData.SetSelectedGameName(selectedGameData.name);
-            gameName.text = selectedGameData.name;
+            if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.Flex;
+            if (gameName != null) gameName.text = LootLockerEditorData.GetSelectedGameName();
             UpdateLicenseCountdownUI();
+            SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
+            if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.Flex;
 
-            LootLockerEditorData.SetEnvironmentStage();
-            isStage = true;
-
-            EditorApplication.update += OnEditorUpdate;
-
-            LootLockerAdminManager.GetGameDomainKey(LootLockerEditorData.GetSelectedGame(), (onComplete) =>
-            {
-                if (!onComplete.success)
-                {
-                    ShowPopup("Error", "Could not find Selected game!");
-                    EditorApplication.update -= OnEditorUpdate;
-                    return;
-                }
-                LootLockerConfig.current.domainKey = onComplete.game.domain_key;
-                EditorApplication.update -= OnEditorUpdate;
-            });
-
-            SwapFlows(apiKeyFlow);
-        }
-
-        void CreateNewAPIKey()
-        {
-            int gameId = LootLockerEditorData.GetSelectedGame();
-            if (gameId == 0)
-            {
-                ShowPopup("Error", "No active Game found!");
-                return;
-            }
-
-            if (isStage)
-            {
-                gameId = gameData[gameId].development.id;
-            }
-
-            EditorApplication.update += OnEditorUpdate;
-            loadingPage.style.display = DisplayStyle.Flex;
-
-            LootLockerAdminManager.GenerateKey(gameId, newApiKeyName.value, "game", (onComplete) =>
+            // Show environment switcher only for non-stage-only games
+            if (environmentElement != null && environmentBackground != null && environmentHandle != null && environmentTitle != null)
             {
-                if (!onComplete.success)
+                if (!IsStageOnlyGame())
                 {
-                    ShowPopup("Error", "Could not create a new API Key!");
-                    loadingPage.style.display = DisplayStyle.None;
+                    environmentElement.style.display = DisplayStyle.Flex;
+                    environmentBackground.style.display = DisplayStyle.Flex;
+                    environmentHandle.style.display = DisplayStyle.Flex;
                 }
-
-                APIKeyTemplate(onComplete);
-
-                EditorApplication.update -= OnEditorUpdate;
-                loadingPage.style.display = DisplayStyle.None;
-
-            });
-
-
-
-            newApiKeyName.value = "";
-        }
-
-        void RefreshAPIKeys()
-        {
-            apiKeyList.Clear();
-            int gameID = LootLockerEditorData.GetSelectedGame();
-            if (isStage)
-            {
-                gameID = gameData[gameID].development.id;
-            }
-            isLoadingKeys = true;
-
-            EditorApplication.update += OnEditorUpdate;
-            loadingPage.style.display = DisplayStyle.Flex;
-
-            LootLockerAdminManager.GetAllKeys(gameID, (onComplete) =>
-            {
-                if (!onComplete.success)
-                {
-                    ShowPopup("Error", "Could not find API Keys!");
-                    loadingPage.style.display = DisplayStyle.None;
-                    return;
-                }
-
-                foreach (var key in onComplete.api_keys)
+                else
                 {
-                    APIKeyTemplate(key);
+                    environmentElement.style.display = DisplayStyle.None;
                 }
-
-                isLoadingKeys = false;
-
-                EditorApplication.update -= OnEditorUpdate;
-                loadingPage.style.display = DisplayStyle.None;
-
-            });
-        }
-
-        void APIKeyTemplate(KeyResponse key)
-        {
-            Button button = new Button();
-            bool isLegacyKey = !(key.api_key.StartsWith("prod_") || key.api_key.StartsWith("dev_"));
-            button.name = key.api_key;
-            Label keyName = new Label();
-            keyName.text = key.name;
-            if (string.IsNullOrEmpty(key.name))
-            {
-                keyName.text += "Unnamed API Key";
-            }
-            if (button.name == LootLockerConfig.current.apiKey)
-            {
-                button.style.borderRightColor = button.style.borderLeftColor = button.style.borderTopColor = button.style.borderBottomColor = stage;
-                button.style.backgroundColor = new StyleColor(new Color(0.2f, 0.5f, 0.2f, 1f)); // Feedback highlight
-            }
-            if (isLegacyKey)
-            {
-                keyName.text = "Legacy key: " + keyName.text;
-                button.AddToClassList("legacyApikey");
-            }
-            else
-            {
-                button.AddToClassList("apikey");
             }
-            keyName.AddToClassList("apikeyName");
-            button.Add(keyName);
-            if (!isLegacyKey)
-            {
-                button.clickable.clickedWithEventInfo += OnAPIKeySelected;
-                button.tooltip = "Click to select this API key.";
-            }
-            apiKeyList?.Add(button);
+            RefreshAPIKeys();
         }
 
-        void OnAPIKeySelected(EventBase e)
+        private void ConfigureSettingsFlow()
         {
-            if (!AtTarget(e))
-                return;
-
-            var target = e.target as Button;
-
-            LootLockerConfig.current.apiKey = target.name;
-
-            SwapNewSelectedKey();
-            ShowPopup("API Key Selected", $"API Key {target.name} is now active."); // Feedback
+            if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.Flex;
+            if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
+            SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
+            if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
+            if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
+            LoadSettingsUI();
         }
 
-        void ConfirmLogout()
+        private void ConfigureLoginFlow()
         {
-            ShowPopup("Confirm Logout", "Are you sure you want to log out? This will clear your admin token and settings.");
-            if (popupBtn != null)
-            {
-                popupBtn.clickable.clickedWithEventInfo -= ClosePopup;
-                popupBtn.clickable.clickedWithEventInfo += (evt) =>
-                {
-                    Logout();
-                    ClosePopup(evt);
-                };
-            }
+            if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
+            if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.None;
+            if (menu != null) menu.style.display = DisplayStyle.None;
+            if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
+            if (securityWarning != null) securityWarning.style.display = DisplayStyle.Flex;
         }
 
-        void Logout()
+        private void ConfigureMfaFlow()
         {
-            loadingPage.style.display = DisplayStyle.Flex;
-            LootLockerEditorData.ClearLootLockerPrefs();
-
-            gameData.Clear();
-            apiKeyList.Clear();
-            gameSelectorList.Clear();
-            loadingPage.style.display = DisplayStyle.None;
-            SwapFlows(loginFlow);
+            if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.None;
+            SetMenuVisibility(apiKey: false, changeGame: false, logout: true);
         }
+        #endregion
 
         private void OnDestroy()
         {
             LootLockerHTTPClient.ResetInstance();
         }
-
-        void SwapNewSelectedKey()
-        {
-            if (apiKeyList == null) return;
-            foreach (var element in apiKeyList.Children())
-            {
-                var key = element as Button;
-                if (key == null) continue;
-                if (key.name == LootLockerConfig.current.apiKey)
-                {
-                    key.style.borderRightColor = key.style.borderLeftColor = key.style.borderTopColor = key.style.borderBottomColor = stage;
-                    key.style.backgroundColor = new StyleColor(new Color(0.2f, 0.5f, 0.2f, 1f)); // Feedback highlight
-                }
-                else
-                {
-                    key.style.backgroundColor = defaultButton;
-                    key.style.borderRightColor = key.style.borderLeftColor = key.style.borderTopColor = key.style.borderBottomColor = defaultButton;
-                }
-            }
-        }
-
-        // Call this whenever the selected game changes or flows swap to APIKeyFlow
-        private void UpdateLicenseCountdownUI()
-        {
-            if (licenseCountdownContainer == null || licenseCountdownLabel == null || licenseCountdownIcon == null)
-                return;
-
-            int selectedGameId = LootLockerEditorData.GetSelectedGame();
-            if (!gameData.ContainsKey(selectedGameId))
-            {
-                licenseCountdownContainer.style.display = DisplayStyle.None;
-                return;
-            }
-            var game = gameData[selectedGameId];
-            string trialEndDate = game.trial_end_date;
-            if (string.IsNullOrEmpty(trialEndDate))
-            {
-                licenseCountdownContainer.style.display = DisplayStyle.None;
-                return;
-            }
-            if (!System.DateTime.TryParse(trialEndDate, out var endDate))
-            {
-                licenseCountdownContainer.style.display = DisplayStyle.None;
-                return;
-            }
-            var now = System.DateTime.UtcNow;
-            int daysLeft = (endDate.Date - now.Date).Days;
-            if (endDate < now)
-            {
-                // Expired
-                licenseCountdownLabel.text = "Trial Expired";
-                licenseCountdownLabel.RemoveFromClassList("licenseCountdownLabel");
-                licenseCountdownLabel.RemoveFromClassList("expired");
-                licenseCountdownLabel.AddToClassList("licenseCountdownLabel");
-                licenseCountdownLabel.AddToClassList("expired");
-                licenseCountdownLabel.style.color = new Color(1f, 0.31f, 0.31f); // rgb(255,80,80)
-                licenseCountdownLabel.style.display = DisplayStyle.Flex;
-                licenseCountdownIcon.image = EditorGUIUtility.IconContent("console.warnicon").image as Texture2D;
-                licenseCountdownIcon.style.display = DisplayStyle.Flex;
-                licenseCountdownContainer.style.display = DisplayStyle.Flex;
-                licenseCountdownContainer.tooltip = "Click to manage your license";
-                licenseCountdownContainer.RegisterCallback<MouseDownEvent>(LicenseCountdownContainerClick);
-            }
-            else if (daysLeft == 0)
-            {
-                // Trial ends today
-                licenseCountdownLabel.text = "Trial ends today";
-                licenseCountdownLabel.RemoveFromClassList("licenseCountdownLabel");
-                licenseCountdownLabel.RemoveFromClassList("expired");
-                licenseCountdownLabel.AddToClassList("licenseCountdownLabel");
-                licenseCountdownLabel.AddToClassList("expired");
-                licenseCountdownLabel.style.color = new Color(1f, 0.31f, 0.31f); // rgb(255,80,80)
-                licenseCountdownLabel.style.display = DisplayStyle.Flex;
-                licenseCountdownIcon.image = EditorGUIUtility.IconContent("console.warnicon").image as Texture2D;
-                licenseCountdownIcon.style.display = DisplayStyle.Flex;
-                licenseCountdownContainer.style.display = DisplayStyle.Flex;
-                licenseCountdownContainer.tooltip = "Click to manage your license";
-                licenseCountdownContainer.RegisterCallback<MouseDownEvent>(LicenseCountdownContainerClick);
-            }
-            else if (daysLeft > 0 && daysLeft <= 10)
-            {
-                // Not expired, but less than or equal to 10 days left
-                licenseCountdownLabel.text = $"Trial ends in {daysLeft} days";
-                licenseCountdownLabel.RemoveFromClassList("expired");
-                licenseCountdownLabel.AddToClassList("licenseCountdownLabel");
-                licenseCountdownLabel.style.display = DisplayStyle.Flex;
-                licenseCountdownIcon.image = EditorGUIUtility.IconContent("_Help").image as Texture2D;
-                licenseCountdownIcon.style.display = DisplayStyle.Flex;
-                licenseCountdownContainer.style.display = DisplayStyle.Flex;
-                licenseCountdownContainer.tooltip = "Learn more about your license";
-                licenseCountdownContainer.UnregisterCallback<MouseDownEvent>(LicenseCountdownContainerClick);
-                licenseCountdownIcon.RegisterCallback<MouseDownEvent>(LicenseCountdownIconClick);
-            }
-            else
-            {
-                // More than 10 days left, hide
-                licenseCountdownContainer.style.display = DisplayStyle.None;
-            }
-        }
-
-        private void LicenseCountdownIconClick(MouseDownEvent evt)
-        {
-            Application.OpenURL("https://console.lootlocker.com");
-            evt.StopPropagation();
-        }
-        private void LicenseCountdownContainerClick(MouseDownEvent evt)
-        {
-            Application.OpenURL("https://console.lootlocker.com");
-            evt.StopPropagation();
-        }        // Settings UI
-        private Button settingsBtn; // Save/Cancel buttons no longer needed
-        private Button settingsBackBtn;
-        private TextField gameVersionField;
-        private Label gameVersionWarning;
-        private EnumField logLevelField;        private Toggle logErrorsAsWarningsToggle, logInBuildsToggle, allowTokenRefreshToggle;
-        // Settings now save immediately - no need for change tracking
-
-        // Individual save methods for immediate saving
-        private void SaveGameVersion(string newVersion)
-        {
-            if (!IsSemverString(newVersion))
-            {
-                if (gameVersionWarning != null)
-                {
-                    gameVersionWarning.text = "Game version must be in format X.Y.Z.B (MAJOR.MINOR.PATCH.BUILD, last two optional)";
-                    gameVersionWarning.style.display = DisplayStyle.Flex;
-                }
-                return;
-            }
-            
-            if (gameVersionWarning != null) gameVersionWarning.style.display = DisplayStyle.None;
-            LootLockerConfig.current.game_version = newVersion;
-            SaveConfig();
-        }
-
-        private void SaveLogLevel(LootLockerLogger.LogLevel newLogLevel)
-        {
-            LootLockerConfig.current.logLevel = newLogLevel;
-            SaveConfig();
-        }
-
-        private void SaveLogErrorsAsWarnings(bool newValue)
-        {
-            LootLockerConfig.current.logErrorsAsWarnings = newValue;
-            SaveConfig();
-        }
-
-        private void SaveLogInBuilds(bool newValue)
-        {
-            LootLockerConfig.current.logInBuilds = newValue;
-            SaveConfig();
-        }
-
-        private void SaveAllowTokenRefresh(bool newValue)
-        {
-            LootLockerConfig.current.allowTokenRefresh = newValue;
-            SaveConfig();
-        }
-
-        private void SaveConfig()
-        {
-            EditorUtility.SetDirty(LootLockerConfig.current);
-#if UNITY_EDITOR
-            UnityEditor.AssetDatabase.SaveAssets();
-#endif
-        }        // Loads current LootLockerConfig values into the settings UI
-        private void LoadSettingsUI()
-        {
-            // Force reload the config to ensure we have the latest values
-            var config = LootLockerConfig.current;
-            if (gameVersionField != null) gameVersionField.SetValueWithoutNotify(config.game_version);
-            if (logLevelField != null) {
-                // Initialize the enum field first, then set value without notification
-                logLevelField.Init(config.logLevel);
-                logLevelField.SetValueWithoutNotify(config.logLevel);
-            }
-            if (logErrorsAsWarningsToggle != null) logErrorsAsWarningsToggle.SetValueWithoutNotify(config.logErrorsAsWarnings);
-            if (logInBuildsToggle != null) logInBuildsToggle.SetValueWithoutNotify(config.logInBuilds);            if (allowTokenRefreshToggle != null) allowTokenRefreshToggle.SetValueWithoutNotify(config.allowTokenRefresh);
-            if (gameVersionWarning != null) gameVersionWarning.style.display = DisplayStyle.None;
-        }
-
-        private static bool IsSemverString(string str)
-        {
-            return System.Text.RegularExpressions.Regex.IsMatch(str,
-                @"^(0|[1-9]\d*)\.(0|[1-9]\d*)(?:\.(0|[1-9]\d*))?(?:\.(0|[1-9]\d*))?$" );
-        }
-
-        // Simple flow switching - no save confirmation needed since settings save immediately
-        void RequestFlowSwitch(VisualElement targetFlow, System.Action onSuccess = null)        {
-            SwapFlows(targetFlow);
-            onSuccess?.Invoke();
-        }
     }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/Runtime/Editor/LootLockerExtensionCalls.cs b/Runtime/Editor/LootLockerExtensionCalls.cs
index 8e90f43d..728759b1 100644
--- a/Runtime/Editor/LootLockerExtensionCalls.cs
+++ b/Runtime/Editor/LootLockerExtensionCalls.cs
@@ -6,7 +6,8 @@
 using LootLocker.Extension.Responses;
 
 namespace LootLocker.Extension
-{    public partial class LootLockerAdminManager
+{
+    public partial class LootLockerAdminManager
     {
         private static LootLockerLogger.LogLevel? savedLogLevel = null;
         private static int activeAdminRequestCount = 0;
@@ -24,7 +25,6 @@ public static void SendAdminRequest(string endPoint, LootLockerHTTPMethod httpMe
             try
             {
                 LootLockerServerRequest.CallAPI(null, endPoint, httpMethod, json, onComplete: (serverResponse) => { 
-                    // Always restore log level, regardless of success or failure
                     try 
                     {
                         LootLockerResponse.Deserialize(onComplete, serverResponse); 
@@ -62,7 +62,6 @@ public static void SendAdminRequest(string endPoint, LootLockerHTTPMethod httpMe
 
         public static void AdminLogin(string email, string password, Action<LoginResponse> onComplete)
         {
-
             EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionLogin;
 
             AdminLoginRequest request = new AdminLoginRequest();
@@ -72,23 +71,22 @@ public static void AdminLogin(string email, string password, Action<LoginRespons
             string json = LootLockerJson.SerializeObject(request);
 
             SendAdminRequest(endPoint.endPoint, endPoint.httpMethod, json,
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
+                (serverResponse) => LootLockerResponse.Deserialize(onComplete, serverResponse), true);
         }
 
         public static void GetGameDomainKey(int game_id, Action<GameResponse> onComplete)
         {
             EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionGetGameInformation;
-
             string getVariable = endPoint.WithPathParameter(game_id);
 
             SendAdminRequest(getVariable, endPoint.httpMethod, "",
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
+                (serverResponse) => LootLockerResponse.Deserialize(onComplete, serverResponse), true);
         }
+
         public static void MFAAuthenticate(string authCode, string secret, Action<LoginResponse> onComplete)
         {
             if (string.IsNullOrEmpty(authCode) || string.IsNullOrEmpty(secret))
             {
-                Debug.Log("No authentication code found!");
                 return;
             }
 
@@ -101,7 +99,7 @@ public static void MFAAuthenticate(string authCode, string secret, Action<LoginR
             string json = LootLockerJson.SerializeObject(data);
 
             SendAdminRequest(endPoint.endPoint, endPoint.httpMethod, json,
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
+                (serverResponse) => LootLockerResponse.Deserialize(onComplete, serverResponse), true);
         }
 
         public static void GetAllKeys(int game_id, Action<KeysResponse> onComplete)
@@ -110,13 +108,12 @@ public static void GetAllKeys(int game_id, Action<KeysResponse> onComplete)
             string getVariable = endPoint.WithPathParameter(game_id);
 
             SendAdminRequest(getVariable, endPoint.httpMethod, "",
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
+                (serverResponse) => LootLockerResponse.Deserialize(onComplete, serverResponse), true);
         }
 
         public static void GenerateKey(int game_id, string key_name, string key_environment, Action<KeyResponse> onComplete)
         {
             EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionCreateKey;
-
             string getVariable = endPoint.WithPathParameter(game_id);
 
             KeyCreationRequest data = new KeyCreationRequest();
@@ -126,7 +123,7 @@ public static void GenerateKey(int game_id, string key_name, string key_environm
             string json = LootLockerJson.SerializeObject(data);
 
             SendAdminRequest(getVariable, endPoint.httpMethod, json,
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
+                (serverResponse) => LootLockerResponse.Deserialize(onComplete, serverResponse), true);
         }
 
         public static void GetUserInformation(Action<LoginResponse> onComplete)
@@ -134,17 +131,16 @@ public static void GetUserInformation(Action<LoginResponse> onComplete)
             EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionUserInformation;
 
             SendAdminRequest(endPoint.endPoint, endPoint.httpMethod, "",
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
+                (serverResponse) => LootLockerResponse.Deserialize(onComplete, serverResponse), true);
         }
 
         public static void GetUserRole(string userId, Action<UserRoleResponse> onComplete)
         {
             EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionGetUserRole;
-
             string getVariable = endPoint.WithPathParameter(userId);
 
             SendAdminRequest(getVariable, endPoint.httpMethod, "",
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
+                (serverResponse) => LootLockerResponse.Deserialize(onComplete, serverResponse), true);
         }
     }
 }

From f435b79e73fe9651fafe20dbc8dda5a1cfa401ef Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Tue, 17 Jun 2025 15:11:58 +0200
Subject: [PATCH 06/12] fix: Only show game api keys in admin extension

---
 .../Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs
index 52793015..cfa0a945 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs	
@@ -59,6 +59,8 @@ public void GameButtonTemplate(LootLocker.Extension.DataTypes.Game game, string
 
         void APIKeyTemplate(KeyResponse key)
         {
+            // Only show game api keys
+            if (key.api_type != "game") return;
             Button button = new Button();
             bool isLegacyKey = !(key.api_key.StartsWith("prod_") || key.api_key.StartsWith("dev_"));
             button.name = key.api_key;

From 462ef2e4fd53ab50694a447d0577ba33fc7d0e88 Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Thu, 19 Jun 2025 14:56:40 +0200
Subject: [PATCH 07/12] feature: Move Admin Extension to own submenu

A preparation for additional tools to come.
---
 Runtime/Editor/Editor UI/LootLockerAdminExtension.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs
index 82c9ee93..9f759cf6 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
@@ -100,7 +100,7 @@ public partial class LootLockerAdminExtension : EditorWindow
         #endregion
 
         #region Window Management
-        [MenuItem("Window/LootLocker")]
+        [MenuItem("LootLocker/Manage", false, 1)]
         public static void Run()
         {
             LootLockerAdminExtension wnd = GetWindow<LootLockerAdminExtension>();

From b44918d7766c317a13353ade26dbf35bc7c4ecd8 Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Thu, 19 Jun 2025 14:59:07 +0200
Subject: [PATCH 08/12] fix: Add reload ui button to Admin Extension

Also shore up visual asset loading.
---
 .../Editor UI/LootLockerAdminExtension.UI.cs  | 48 +++++++++++++++++--
 .../Editor UI/LootLockerAdminExtension.uxml   |  5 +-
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs
index 9979bc53..1188743e 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs	
@@ -7,10 +7,40 @@ namespace LootLocker.Extension
 {
     public partial class LootLockerAdminExtension : EditorWindow
     {
+        private Button reloadButton;
+
         public void InitializeUIElements()
         {
-            VisualElement root = rootVisualElement;
-            VisualElement labelFromUXML = m_VisualTreeAsset.Instantiate();
+            // Clear the root to remove all previous UI
+            var root = rootVisualElement;
+            root.Clear();
+            reloadButton = null;
+            loadingPage = null;
+            loadingIcon = null;
+
+            VisualTreeAsset visualTree = m_VisualTreeAsset;
+            if (visualTree == null)
+            {
+                // Try to load from Assets/LootLockerSDK
+                visualTree = EditorGUIUtility.Load("Assets/LootLockerSDK/Runtime/Editor UI/LootLockerAdminExtension.uxml") as VisualTreeAsset;
+            }
+            if (visualTree == null)
+            {
+                // Try to load from Assets/LootLocker
+                visualTree = EditorGUIUtility.Load("Assets/LootLocker/Runtime/Editor UI/LootLockerAdminExtension.uxml") as VisualTreeAsset;
+            }
+            if (visualTree == null)
+            {
+                // Try to load from Packages
+                visualTree = EditorGUIUtility.Load("Packages/com.lootlocker.lootlockersdk/Runtime/Editor UI/LootLockerAdminExtension.uxml") as VisualTreeAsset;
+            }
+            if (visualTree == null)
+            {
+                Debug.LogError("LootLockerAdminExtension: LootLocker not found in `Assets/LootLocker` or in Packages. Non standard install locations not supported.");
+                return;
+            }
+
+            VisualElement labelFromUXML = visualTree.Instantiate();
 
             var styleLength = new StyleLength();
             var current = styleLength.value;
@@ -133,8 +163,8 @@ private void InitializeEventHandlers()
 
             // Menu buttons
             if (menuLogoutBtn != null) menuLogoutBtn.clickable.clicked += ConfirmLogout;
-            if (menuChangeGameBtn != null) menuChangeGameBtn.clickable.clicked += () => RequestFlowSwitch(gameSelectorFlow);
-            if (menuAPIKeyBtn != null) menuAPIKeyBtn.clickable.clicked += () => RequestFlowSwitch(apiKeyFlow);
+            if (menuChangeGameBtn != null) menuChangeGameBtn.clickable.clicked += () => SwapFlows(gameSelectorFlow);
+            if (menuAPIKeyBtn != null) menuAPIKeyBtn.clickable.clicked += () => SwapFlows(apiKeyFlow);
 
             // Popup
             if (popupBtn != null) popupBtn.clickable.clickedWithEventInfo += ClosePopup;
@@ -185,6 +215,16 @@ private void InitializeLoadingIcon(VisualElement root)
             if (loadingPage != null) loadingPage.style.display = DisplayStyle.Flex;
             currentFlow = loadingPage;
 
+            if (loadingPage != null)
+            {
+                reloadButton = new Button(() => CreateGUI()) { text = "Reload", tooltip = "Reload UI" };
+                reloadButton.style.position = Position.Absolute;
+                reloadButton.style.top = 8;
+                reloadButton.style.right = 8;
+                reloadButton.style.display = DisplayStyle.Flex;
+                loadingPage.Add(reloadButton);
+            }
+
             loadingIcon = root.Q<VisualElement>("LoadingIcon");
             if (loadingIcon != null)
             {
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml
index 114f5a07..71eb35a1 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml	
@@ -13,7 +13,9 @@
                     <ui:Button name="SettingsBtn" tooltip="Settings" style="width: 28px; height: 28px; align-self: center; background-color: rgba(60, 60, 60, 0); border-width: 1px; border-color: rgba(100,100,100,0.0); border-radius: 0px; font-size: 18px; cursor: link; display: none; color: rgb(200,200,200);" />
                 </ui:VisualElement>
             </ui:VisualElement>
-        </ui:VisualElement>        <ui:VisualElement name="ContentView" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); margin-top: 0; opacity: 1; bottom: 0; top: 0; height: 100%;">            <ui:VisualElement name="MenuBar" style="flex-grow: 0; flex-shrink: 0; visibility: visible; display: flex; border-bottom-width: 2px; border-bottom-color: rgb(46, 46, 46); flex-direction: row; justify-content: flex-start; align-self: auto; align-items: center; margin-left: 0; margin-bottom: 12px; min-height: 40px;">
+        </ui:VisualElement>
+        <ui:VisualElement name="ContentView" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); margin-top: 0; opacity: 1; bottom: 0; top: 0; height: 100%;">
+            <ui:VisualElement name="MenuBar" style="flex-grow: 0; flex-shrink: 0; visibility: visible; display: flex; border-bottom-width: 2px; border-bottom-color: rgb(46, 46, 46); flex-direction: row; justify-content: flex-start; align-self: auto; align-items: center; margin-left: 0; margin-bottom: 12px; min-height: 40px;">
                 <ui:VisualElement name="DynamicMenu" style="flex-grow: 1; flex-direction: row; align-items: center;">
                     <ui:Button text="API Keys" display-tooltip-when-elided="true" name="APIKeyBtn" class="menuBtn" style="-unity-font-style: bold; background-color: rgba(188, 188, 188, 0); border-left-color: rgba(149, 149, 149, 0); border-right-color: rgba(149, 149, 149, 0); border-top-color: rgba(149, 149, 149, 0); border-bottom-color: rgba(149, 149, 149, 0); margin-left: 20px;" />
                 </ui:VisualElement>
@@ -76,6 +78,7 @@
                 <ui:Toggle name="AllowTokenRefreshToggle" label="Allow Token Refresh" style="margin-bottom: 24px;" />
                 <ui:Button text="← Back" name="SettingsBackBtn" style="align-self: flex-start; font-size: 12px; padding: 4px 8px; background-color: rgba(80, 80, 80, 0.3); border-color: rgba(120, 120, 120, 0.5); color: rgb(180, 180, 180);" />
             </ui:VisualElement>
+            <!-- LogViewerFlow and all log viewer UI elements have been removed. -->
         </ui:VisualElement>
     </ui:VisualElement>
     <ui:VisualElement name="InfoandCreate" style="flex-grow: 1; align-self: center; align-items: auto; justify-content: flex-start; -unity-text-align: middle-center; flex-direction: column; margin-right: 15px; margin-left: 0; padding-left: 0; min-width: 81px; max-width: 167px; position: absolute; right: 0; top: 109px; bottom: 0;">

From 1110013a992d8e5187c2e68f5e4c44300c8af9be Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Mon, 23 Jun 2025 11:07:10 +0200
Subject: [PATCH 09/12] fix: Hide uses of extension between preprocessors

---
 .../Editor UI/LootLockerAdminExtension.Authentication.cs       | 3 ++-
 .../Editor UI/LootLockerAdminExtension.GameManagement.cs       | 3 ++-
 Runtime/Editor/LootLockerExtensionCalls.cs                     | 2 +-
 Runtime/Editor/LootLockerExtensionResponses.cs                 | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs
index 95e39f79..8429ffd1 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs	
@@ -1,10 +1,11 @@
 using System;
-using LootLocker.Extension.Responses;
 using UnityEngine;
 using UnityEngine.UIElements;
 using UnityEditor;
 
 #if UNITY_EDITOR && UNITY_2021_3_OR_NEWER && !LOOTLOCKER_DISABLE_EDITOR_EXTENSION
+using LootLocker.Extension.Responses;
+
 namespace LootLocker.Extension
 {
     public partial class LootLockerAdminExtension : EditorWindow
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs
index cfa0a945..34af4937 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs	
@@ -1,10 +1,11 @@
 using System;
-using LootLocker.Extension.Responses;
 using UnityEngine;
 using UnityEngine.UIElements;
 using UnityEditor;
 
 #if UNITY_EDITOR && UNITY_2021_3_OR_NEWER && !LOOTLOCKER_DISABLE_EDITOR_EXTENSION
+using LootLocker.Extension.Responses;
+
 namespace LootLocker.Extension
 {
     public partial class LootLockerAdminExtension : EditorWindow
diff --git a/Runtime/Editor/LootLockerExtensionCalls.cs b/Runtime/Editor/LootLockerExtensionCalls.cs
index 728759b1..3bb877e3 100644
--- a/Runtime/Editor/LootLockerExtensionCalls.cs
+++ b/Runtime/Editor/LootLockerExtensionCalls.cs
@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER && !LOOTLOCKER_DISABLE_EDITOR_EXTENSION
 using LootLocker.Extension.Requests;
 using LootLocker.Extension.Responses;
 
diff --git a/Runtime/Editor/LootLockerExtensionResponses.cs b/Runtime/Editor/LootLockerExtensionResponses.cs
index 5523921e..f1b91519 100644
--- a/Runtime/Editor/LootLockerExtensionResponses.cs
+++ b/Runtime/Editor/LootLockerExtensionResponses.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 
-#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER && !LOOTLOCKER_DISABLE_EDITOR_EXTENSION
 using LootLocker.Extension.DataTypes;
+
 namespace LootLocker.Extension.Requests
 {
     public class MfaAdminLoginRequest

From 7fcec617bd2cd9353bce493509e3e8f6eaf32012 Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Mon, 23 Jun 2025 11:20:04 +0200
Subject: [PATCH 10/12] fix: Hide loglevel becaus EnumField does not exist in
 2021

---
 .../Editor UI/LootLockerAdminExtension.Settings.cs       | 3 ++-
 Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs  | 9 +++++++++
 Runtime/Editor/Editor UI/LootLockerAdminExtension.cs     | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs
index 040a7f24..7c448538 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Settings.cs	
@@ -64,12 +64,13 @@ public void LoadSettingsUI()
             if (gameVersionField != null) 
                 gameVersionField.SetValueWithoutNotify(config.game_version);
             
+#if UNITY_2022_1_OR_NEWER
             if (logLevelField != null) 
             {
                 logLevelField.Init(config.logLevel);
                 logLevelField.SetValueWithoutNotify(config.logLevel);
             }
-            
+#endif
             if (logErrorsAsWarningsToggle != null) 
                 logErrorsAsWarningsToggle.SetValueWithoutNotify(config.logErrorsAsWarnings);
             
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs
index 1188743e..0b76d9b7 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs	
@@ -133,7 +133,14 @@ private void InitializeUIReferences(VisualElement root)
             settingsBackBtn = root.Q<Button>("SettingsBackBtn");
             gameVersionField = root.Q<TextField>("GameVersionField");
             gameVersionWarning = root.Q<Label>("GameVersionWarning");
+#if UNITY_2022_1_OR_NEWER
             logLevelField = root.Q<EnumField>("LogLevelField");
+#else
+            Label logLevelTooltip = new Label("Log Level editing requires Unity 2022.1 or newer.");
+            logLevelTooltip.tooltip = "Log Level editing requires Unity 2022.1 or newer.";
+            logLevelTooltip.style.color = new StyleColor(Color.yellow);
+            settingsFlow.Add(logLevelTooltip);
+#endif
             logErrorsAsWarningsToggle = root.Q<Toggle>("LogErrorsAsWarningsToggle");
             logInBuildsToggle = root.Q<Toggle>("LogInBuildsToggle");
             allowTokenRefreshToggle = root.Q<Toggle>("AllowTokenRefreshToggle");
@@ -195,7 +202,9 @@ private void InitializeEventHandlers()
         private void InitializeSettingsEventHandlers()
         {
             if (gameVersionField != null) gameVersionField.RegisterValueChangedCallback(evt => SaveGameVersion(evt.newValue));
+#if UNITY_2022_1_OR_NEWER
             if (logLevelField != null) logLevelField.RegisterValueChangedCallback(evt => SaveLogLevel((LootLockerLogger.LogLevel)evt.newValue));
+#endif
             if (logErrorsAsWarningsToggle != null) logErrorsAsWarningsToggle.RegisterValueChangedCallback(evt => SaveLogErrorsAsWarnings(evt.newValue));
             if (logInBuildsToggle != null) logInBuildsToggle.RegisterValueChangedCallback(evt => SaveLogInBuilds(evt.newValue));
             if (allowTokenRefreshToggle != null) allowTokenRefreshToggle.RegisterValueChangedCallback(evt => SaveAllowTokenRefresh(evt.newValue));
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs
index 9f759cf6..57fa00a3 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
@@ -95,7 +95,9 @@ public partial class LootLockerAdminExtension : EditorWindow
         private Button settingsBackBtn;
         private TextField gameVersionField;
         private Label gameVersionWarning;
+#if UNITY_2022_1_OR_NEWER
         private EnumField logLevelField;
+#endif
         private Toggle logErrorsAsWarningsToggle, logInBuildsToggle, allowTokenRefreshToggle;
         #endregion
 

From a4d4c138990abd3749b6542d863d07cc855c68c2 Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Mon, 23 Jun 2025 15:45:16 +0200
Subject: [PATCH 11/12] fix: Stop using disallowed leaderboard keys

---
 Tests/LootLockerTests/PlayMode/LeaderboardTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/LootLockerTests/PlayMode/LeaderboardTest.cs b/Tests/LootLockerTests/PlayMode/LeaderboardTest.cs
index f6c5518c..c331704d 100644
--- a/Tests/LootLockerTests/PlayMode/LeaderboardTest.cs
+++ b/Tests/LootLockerTests/PlayMode/LeaderboardTest.cs
@@ -198,7 +198,7 @@ public IEnumerator Leaderboard_ListTopTenAsGeneric_Succeeds()
             Assert.IsFalse(SetupFailed, "Failed to setup game");
 
             //Given 
-            string genericLeaderboardKey = "genericLeaderboard";
+            string genericLeaderboardKey = "genericleaderboard";
             var createLeaderboardRequest = new CreateLootLockerLeaderboardRequest
             {
                 name = "Local Generic Leaderboard",

From a36b94a9394fca642ccbbf7afd57f23e5cdb94ec Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Mon, 23 Jun 2025 16:36:33 +0200
Subject: [PATCH 12/12] fix: Move LootLocker extensions to
 Window/LootLocker/<tool>

---
 Runtime/Editor/Editor UI/LootLockerAdminExtension.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs
index 57fa00a3..ad1d63d2 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
@@ -102,7 +102,7 @@ public partial class LootLockerAdminExtension : EditorWindow
         #endregion
 
         #region Window Management
-        [MenuItem("LootLocker/Manage", false, 1)]
+        [MenuItem("Window/LootLocker/Manage", false, 1)]
         public static void Run()
         {
             LootLockerAdminExtension wnd = GetWindow<LootLockerAdminExtension>();