diff --git a/.github/workflows/LANCommander.Development.yml b/.github/workflows/LANCommander.Development.yml
index 12c1d130..42a9c804 100644
--- a/.github/workflows/LANCommander.Development.yml
+++ b/.github/workflows/LANCommander.Development.yml
@@ -1,6 +1,9 @@
 name: LANCommander Development
 
 on:
+  push:
+    branches:
+      - development
   workflow_dispatch:
     
 env:
diff --git a/LANCommander.Launcher.Services/AuthenticationService.cs b/LANCommander.Launcher.Services/AuthenticationService.cs
index 78d42276..2f8d2a8b 100644
--- a/LANCommander.Launcher.Services/AuthenticationService.cs
+++ b/LANCommander.Launcher.Services/AuthenticationService.cs
@@ -7,8 +7,6 @@ using LANCommander.SDK.Providers;
 using LANCommander.SDK.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Settings = LANCommander.Launcher.Models.Settings;
 
 namespace LANCommander.Launcher.Services;
 
@@ -37,6 +35,7 @@ public class AuthenticationService(
         }
         catch
         {
+            logger.LogDebug("Server could not be reached");
         }
 
         return false;
diff --git a/LANCommander.Launcher.Services/DepotService.cs b/LANCommander.Launcher.Services/DepotService.cs
index 604fbc07..aeea266a 100644
--- a/LANCommander.Launcher.Services/DepotService.cs
+++ b/LANCommander.Launcher.Services/DepotService.cs
@@ -4,6 +4,7 @@ using LANCommander.SDK;
 using LANCommander.SDK.Extensions;
 using Microsoft.Extensions.Logging;
 using System.Collections.ObjectModel;
+using LANCommander.SDK.Services;
 
 namespace LANCommander.Launcher.Services
 {
@@ -18,13 +19,13 @@ namespace LANCommander.Launcher.Services
         public delegate Task OnItemsFilteredHandler(IEnumerable<ListItem> items);
         public event OnItemsFilteredHandler OnItemsFiltered;
 
-        private SDK.Client _client;
+        private DepotClient _depotClient;
 
         public DepotService(
-            Client client,
+            DepotClient depotClient,
             ILogger<DepotService> logger) : base(logger)
         {
-            _client = client;
+            _depotClient = depotClient;
             Filter.OnChanged += Filter_OnChanged;
         }
 
@@ -62,7 +63,7 @@ namespace LANCommander.Launcher.Services
 
             using (var op = Logger.BeginDebugOperation("Loading depot items from host"))
             {
-                var results = await _client.Depot.GetAsync();
+                var results = await _depotClient.GetAsync();
 
                 Filter.Populate(results);
 
diff --git a/LANCommander.Launcher/UI/App.Chat.razor b/LANCommander.Launcher/UI/App.Chat.razor
index d3cb297c..a51dfaf0 100644
--- a/LANCommander.Launcher/UI/App.Chat.razor
+++ b/LANCommander.Launcher/UI/App.Chat.razor
@@ -21,4 +21,4 @@
         if (currentUri.LocalPath == "/")
             NavigationManager.NavigateTo("/Chat", true);
     }
-}
\ No newline at end of file
+}
diff --git a/LANCommander.Launcher/UI/Authenticate/Authenticate.razor b/LANCommander.Launcher/UI/Authenticate/Authenticate.razor
deleted file mode 100644
index 2ea3cc87..00000000
--- a/LANCommander.Launcher/UI/Authenticate/Authenticate.razor
+++ /dev/null
@@ -1,7 +0,0 @@
-@page "/Authenticate"
-
-<AuthenticationForm />
-
-@code {
-    
-}
\ No newline at end of file
diff --git a/LANCommander.Launcher/UI/Components/Authentication/AuthenticationForm.razor b/LANCommander.Launcher/UI/Components/Authentication/AuthenticationForm.razor
index 79bff463..00e15eb9 100644
--- a/LANCommander.Launcher/UI/Components/Authentication/AuthenticationForm.razor
+++ b/LANCommander.Launcher/UI/Components/Authentication/AuthenticationForm.razor
@@ -1,4 +1,3 @@
-@using LANCommander.Launcher.UI.Authenticate.Components
 @using LANCommander.SDK.Services
 @namespace LANCommander.Launcher.UI
 @inject IMessageService MessageService
diff --git a/LANCommander.Launcher/UI/Components/RedirectToLogin.razor b/LANCommander.Launcher/UI/Components/RedirectToLogin.razor
index 0a8754bd..2ab2295f 100644
--- a/LANCommander.Launcher/UI/Components/RedirectToLogin.razor
+++ b/LANCommander.Launcher/UI/Components/RedirectToLogin.razor
@@ -7,6 +7,6 @@
         var currentUri = new Uri(NavigationManager.Uri);
 
         if (String.IsNullOrEmpty(Client.Settings.CurrentValue.Authentication.AccessToken) && currentUri.LocalPath != "/Authenticate")
-            NavigationManager.NavigateTo("/Authenticate");
+            NavigationManager.NavigateTo("/Authenticate", true);
     }
 }
diff --git a/LANCommander.Launcher/UI/Layouts/AuthenticatedLayout.razor b/LANCommander.Launcher/UI/Layouts/AuthenticatedLayout.razor
new file mode 100644
index 00000000..ac1141ff
--- /dev/null
+++ b/LANCommander.Launcher/UI/Layouts/AuthenticatedLayout.razor
@@ -0,0 +1,12 @@
+@using LANCommander.Launcher.UI.Windows
+@inherits LayoutComponentBase
+@layout MainWindow
+
+<AuthenticatedView NoAutoValidate="false">
+    <Authenticated>
+        @Body
+    </Authenticated>
+    <NotAuthenticated>
+        <RedirectToLogin/>
+    </NotAuthenticated>
+</AuthenticatedView>
\ No newline at end of file
diff --git a/LANCommander.Launcher/UI/Authenticate/Components/AuthenticationFormState.cs b/LANCommander.Launcher/UI/Pages/Authenticate/Components/AuthenticationFormState.cs
similarity index 69%
rename from LANCommander.Launcher/UI/Authenticate/Components/AuthenticationFormState.cs
rename to LANCommander.Launcher/UI/Pages/Authenticate/Components/AuthenticationFormState.cs
index 8e4ae317..93f79545 100644
--- a/LANCommander.Launcher/UI/Authenticate/Components/AuthenticationFormState.cs
+++ b/LANCommander.Launcher/UI/Pages/Authenticate/Components/AuthenticationFormState.cs
@@ -1,4 +1,4 @@
-namespace LANCommander.Launcher.UI.Authenticate.Components;
+namespace LANCommander.Launcher.UI.Components;
 
 public class AuthenticationFormState
 {
diff --git a/LANCommander.Launcher/UI/Authenticate/Components/AuthenticationStage.cs b/LANCommander.Launcher/UI/Pages/Authenticate/Components/AuthenticationStage.cs
similarity index 59%
rename from LANCommander.Launcher/UI/Authenticate/Components/AuthenticationStage.cs
rename to LANCommander.Launcher/UI/Pages/Authenticate/Components/AuthenticationStage.cs
index e47f78fe..4e2674c4 100644
--- a/LANCommander.Launcher/UI/Authenticate/Components/AuthenticationStage.cs
+++ b/LANCommander.Launcher/UI/Pages/Authenticate/Components/AuthenticationStage.cs
@@ -1,4 +1,4 @@
-namespace LANCommander.Launcher.UI.Authenticate.Components;
+namespace LANCommander.Launcher.UI.Components;
 
 public enum AuthenticationStage
 {
diff --git a/LANCommander.Launcher/UI/Authenticate/Components/LoginForm.razor b/LANCommander.Launcher/UI/Pages/Authenticate/Components/LoginForm.razor
similarity index 99%
rename from LANCommander.Launcher/UI/Authenticate/Components/LoginForm.razor
rename to LANCommander.Launcher/UI/Pages/Authenticate/Components/LoginForm.razor
index 05fbc4a9..f2206b89 100644
--- a/LANCommander.Launcher/UI/Authenticate/Components/LoginForm.razor
+++ b/LANCommander.Launcher/UI/Pages/Authenticate/Components/LoginForm.razor
@@ -1,6 +1,7 @@
 @using LANCommander.SDK.Exceptions
 @using LANCommander.SDK.Models
 @using LANCommander.SDK.Services
+@namespace LANCommander.Launcher.UI.Components
 @inject AuthenticationService AuthenticationService
 @inject SDK.Client Client
 @inject IConnectionClient ConnectionClient
diff --git a/LANCommander.Launcher/UI/Authenticate/Components/RegistrationForm.razor b/LANCommander.Launcher/UI/Pages/Authenticate/Components/RegistrationForm.razor
similarity index 98%
rename from LANCommander.Launcher/UI/Authenticate/Components/RegistrationForm.razor
rename to LANCommander.Launcher/UI/Pages/Authenticate/Components/RegistrationForm.razor
index bbe98bc7..7e692a20 100644
--- a/LANCommander.Launcher/UI/Authenticate/Components/RegistrationForm.razor
+++ b/LANCommander.Launcher/UI/Pages/Authenticate/Components/RegistrationForm.razor
@@ -1,5 +1,6 @@
 @using LANCommander.SDK.Exceptions
 @using LANCommander.SDK.Models
+@namespace LANCommander.Launcher.UI.Components
 @inject AuthenticationService AuthenticationService
 @inject SDK.Client Client
 @inject NavigationManager NavigationManager
diff --git a/LANCommander.Launcher/UI/Authenticate/Components/ServerSelector.razor b/LANCommander.Launcher/UI/Pages/Authenticate/Components/ServerSelector.razor
similarity index 99%
rename from LANCommander.Launcher/UI/Authenticate/Components/ServerSelector.razor
rename to LANCommander.Launcher/UI/Pages/Authenticate/Components/ServerSelector.razor
index f63781be..81d079f1 100644
--- a/LANCommander.Launcher/UI/Authenticate/Components/ServerSelector.razor
+++ b/LANCommander.Launcher/UI/Pages/Authenticate/Components/ServerSelector.razor
@@ -1,6 +1,7 @@
 @using LANCommander.Launcher.Models
 @using LANCommander.SDK.Models
 @using ListItem = AntDesign.ListItem
+@namespace LANCommander.Launcher.UI.Components
 @inject NavigationManager NavigationManager
 @inject SDK.Client Client
 @inject AuthenticationService AuthenticationService
diff --git a/LANCommander.Launcher/UI/Pages/Authenticate/Index.razor b/LANCommander.Launcher/UI/Pages/Authenticate/Index.razor
new file mode 100644
index 00000000..3b27431b
--- /dev/null
+++ b/LANCommander.Launcher/UI/Pages/Authenticate/Index.razor
@@ -0,0 +1,11 @@
+@page "/Authenticate"
+
+<AuthenticationForm />
+
+@code {
+    protected override void OnInitialized()
+    {
+        
+    }
+
+}
\ No newline at end of file
diff --git a/LANCommander.Launcher/UI/Depot/Components/DepotFilter.razor b/LANCommander.Launcher/UI/Pages/Depot/Components/DepotFilter.razor
similarity index 99%
rename from LANCommander.Launcher/UI/Depot/Components/DepotFilter.razor
rename to LANCommander.Launcher/UI/Pages/Depot/Components/DepotFilter.razor
index 2de2d8d6..e3ee34b1 100644
--- a/LANCommander.Launcher/UI/Depot/Components/DepotFilter.razor
+++ b/LANCommander.Launcher/UI/Pages/Depot/Components/DepotFilter.razor
@@ -1,5 +1,6 @@
 @using LANCommander.Launcher.Models.Enums
 @using LANCommander.SDK.Models
+@namespace LANCommander.Launcher.UI.Components
 @inject DepotService DepotService
 @inject LocalizationService LocalizationService
 
diff --git a/LANCommander.Launcher/UI/Depot/Components/DepotGameDetails.razor b/LANCommander.Launcher/UI/Pages/Depot/Components/DepotGameDetails.razor
similarity index 99%
rename from LANCommander.Launcher/UI/Depot/Components/DepotGameDetails.razor
rename to LANCommander.Launcher/UI/Pages/Depot/Components/DepotGameDetails.razor
index 25f53998..54a24463 100644
--- a/LANCommander.Launcher/UI/Depot/Components/DepotGameDetails.razor
+++ b/LANCommander.Launcher/UI/Pages/Depot/Components/DepotGameDetails.razor
@@ -1,7 +1,7 @@
 @using LANCommander.Launcher.Data.Models
 @using LANCommander.Launcher.Models
 @using LANCommander.SDK.Extensions
-@inject DepotService DepotService
+@namespace LANCommander.Launcher.UI.Components
 @inject LibraryService LibraryService
 @inject GameService GameService
 @inject InstallService InstallService
diff --git a/LANCommander.Launcher/UI/Depot/Components/DepotGameItem.razor b/LANCommander.Launcher/UI/Pages/Depot/Components/DepotGameItem.razor
similarity index 97%
rename from LANCommander.Launcher/UI/Depot/Components/DepotGameItem.razor
rename to LANCommander.Launcher/UI/Pages/Depot/Components/DepotGameItem.razor
index 687795f5..c3ccbce8 100644
--- a/LANCommander.Launcher/UI/Depot/Components/DepotGameItem.razor
+++ b/LANCommander.Launcher/UI/Pages/Depot/Components/DepotGameItem.razor
@@ -1,6 +1,5 @@
 @using LANCommander.SDK.Models
-@inject SDK.Client Client
-@inject DepotService DepotService
+@namespace LANCommander.Launcher.UI.Components
 @inject LibraryService LibraryService
 @inject ImportService ImportService
 @inject IMessageService MessageService
diff --git a/LANCommander.Launcher/UI/Depot/Components/DepotList.razor b/LANCommander.Launcher/UI/Pages/Depot/Components/DepotList.razor
similarity index 98%
rename from LANCommander.Launcher/UI/Depot/Components/DepotList.razor
rename to LANCommander.Launcher/UI/Pages/Depot/Components/DepotList.razor
index b29382df..94542df7 100644
--- a/LANCommander.Launcher/UI/Depot/Components/DepotList.razor
+++ b/LANCommander.Launcher/UI/Pages/Depot/Components/DepotList.razor
@@ -1,4 +1,4 @@
-@inject SDK.Client Client
+@namespace LANCommander.Launcher.UI.Components
 @inject DepotService DepotService
 @inject LocalizationService LocalizationService
 
diff --git a/LANCommander.Launcher/UI/Depot/Index.razor b/LANCommander.Launcher/UI/Pages/Depot/Index.razor
similarity index 98%
rename from LANCommander.Launcher/UI/Depot/Index.razor
rename to LANCommander.Launcher/UI/Pages/Depot/Index.razor
index 716aa626..0492c3a8 100644
--- a/LANCommander.Launcher/UI/Depot/Index.razor
+++ b/LANCommander.Launcher/UI/Pages/Depot/Index.razor
@@ -1,9 +1,9 @@
 @page "/Depot"
 @page "/Depot/{id:guid}"
 @using LANCommander.Launcher.Models
-@using LANCommander.Launcher.UI.Depot.Components
 @using LANCommander.SDK.Exceptions
 @implements IDisposable
+@layout AuthenticatedLayout
 @inject NavigationManager NavigationManager
 @inject DepotService DepotService
 @inject LibraryService LibraryService
diff --git a/LANCommander.Launcher/UI/Library/Components/GameActionBar.razor b/LANCommander.Launcher/UI/Pages/Library/Components/GameActionBar.razor
similarity index 99%
rename from LANCommander.Launcher/UI/Library/Components/GameActionBar.razor
rename to LANCommander.Launcher/UI/Pages/Library/Components/GameActionBar.razor
index b0177db0..106da344 100644
--- a/LANCommander.Launcher/UI/Library/Components/GameActionBar.razor
+++ b/LANCommander.Launcher/UI/Pages/Library/Components/GameActionBar.razor
@@ -4,6 +4,7 @@
 @using Button = AntDesign.Button
 @using ButtonType = AntDesign.ButtonType
 @using Tooltip = AntDesign.Tooltip
+@namespace LANCommander.Launcher.UI.Components
 @inject LocalizationService LocalizationService
 @inject InstallService InstallService
 @inject GameClient GameClient
diff --git a/LANCommander.Launcher/UI/Library/Components/GameDetails.razor b/LANCommander.Launcher/UI/Pages/Library/Components/GameDetails.razor
similarity index 98%
rename from LANCommander.Launcher/UI/Library/Components/GameDetails.razor
rename to LANCommander.Launcher/UI/Pages/Library/Components/GameDetails.razor
index 09d3a62d..449b8f52 100644
--- a/LANCommander.Launcher/UI/Library/Components/GameDetails.razor
+++ b/LANCommander.Launcher/UI/Pages/Library/Components/GameDetails.razor
@@ -1,5 +1,6 @@
 @using LANCommander.Launcher.Data.Models
 @using LANCommander.SDK.Services
+@namespace LANCommander.Launcher.UI.Components
 @inject GameClient GameClient
 
 <CascadingValue Value="CurrentGame">
diff --git a/LANCommander.Launcher/UI/Library/Components/GameMetadata.razor b/LANCommander.Launcher/UI/Pages/Library/Components/GameMetadata.razor
similarity index 97%
rename from LANCommander.Launcher/UI/Library/Components/GameMetadata.razor
rename to LANCommander.Launcher/UI/Pages/Library/Components/GameMetadata.razor
index 68f00b37..6f0af974 100644
--- a/LANCommander.Launcher/UI/Library/Components/GameMetadata.razor
+++ b/LANCommander.Launcher/UI/Pages/Library/Components/GameMetadata.razor
@@ -1,3 +1,4 @@
+@namespace LANCommander.Launcher.UI.Components
 @inject LocalizationService LocalizationService
 
 <div class="game-metadata">
diff --git a/LANCommander.Launcher/UI/Library/Components/LibraryItemDetails.razor b/LANCommander.Launcher/UI/Pages/Library/Components/LibraryItemDetails.razor
similarity index 82%
rename from LANCommander.Launcher/UI/Library/Components/LibraryItemDetails.razor
rename to LANCommander.Launcher/UI/Pages/Library/Components/LibraryItemDetails.razor
index d5b463f6..c20db24f 100644
--- a/LANCommander.Launcher/UI/Library/Components/LibraryItemDetails.razor
+++ b/LANCommander.Launcher/UI/Pages/Library/Components/LibraryItemDetails.razor
@@ -1,3 +1,4 @@
+@namespace LANCommander.Launcher.UI.Components
 @using ListItem = LANCommander.Launcher.Models.ListItem
 
 @if (CurrentItem?.DataItem is Data.Models.Game)
diff --git a/LANCommander.Launcher/UI/Library/Components/LibraryList.razor b/LANCommander.Launcher/UI/Pages/Library/Components/LibraryList.razor
similarity index 98%
rename from LANCommander.Launcher/UI/Library/Components/LibraryList.razor
rename to LANCommander.Launcher/UI/Pages/Library/Components/LibraryList.razor
index f6de85cb..b532bdb4 100644
--- a/LANCommander.Launcher/UI/Library/Components/LibraryList.razor
+++ b/LANCommander.Launcher/UI/Pages/Library/Components/LibraryList.razor
@@ -1,4 +1,5 @@
 @using LANCommander.SDK.Extensions
+@namespace LANCommander.Launcher.UI.Components
 @inject LibraryService LibraryService
 @inject NavigationManager NavigationManager
 @inject LocalizationService LocalizationService
diff --git a/LANCommander.Launcher/UI/Library/Components/LibraryListItem.razor b/LANCommander.Launcher/UI/Pages/Library/Components/LibraryListItem.razor
similarity index 96%
rename from LANCommander.Launcher/UI/Library/Components/LibraryListItem.razor
rename to LANCommander.Launcher/UI/Pages/Library/Components/LibraryListItem.razor
index dcfca494..35e3dee4 100644
--- a/LANCommander.Launcher/UI/Library/Components/LibraryListItem.razor
+++ b/LANCommander.Launcher/UI/Pages/Library/Components/LibraryListItem.razor
@@ -1,4 +1,5 @@
 @using LANCommander.Launcher.Models
+@namespace LANCommander.Launcher.UI.Components
 
 <Dropdown Trigger="new Trigger[] { Trigger.ContextMenu }" Style="display: block; width: 100%;">
     <Overlay>
diff --git a/LANCommander.Launcher/UI/Library/Index.razor b/LANCommander.Launcher/UI/Pages/Library/Index.razor
similarity index 98%
rename from LANCommander.Launcher/UI/Library/Index.razor
rename to LANCommander.Launcher/UI/Pages/Library/Index.razor
index b6e2dfe4..53ff2107 100644
--- a/LANCommander.Launcher/UI/Library/Index.razor
+++ b/LANCommander.Launcher/UI/Pages/Library/Index.razor
@@ -2,7 +2,7 @@
 @page "/Library/{id:guid}"
 @using LANCommander.Launcher.Data.Models
 @using LANCommander.Launcher.Models
-@using LANCommander.Launcher.UI.Library.Components
+@layout AuthenticatedLayout
 @inject NavigationManager NavigationManager
 @inject LibraryService LibraryService
 @inject InstallService InstallService
diff --git a/LANCommander.Launcher/UI/Settings/Index.razor b/LANCommander.Launcher/UI/Pages/Settings/Index.razor
similarity index 99%
rename from LANCommander.Launcher/UI/Settings/Index.razor
rename to LANCommander.Launcher/UI/Pages/Settings/Index.razor
index 2b70d149..d4711c94 100644
--- a/LANCommander.Launcher/UI/Settings/Index.razor
+++ b/LANCommander.Launcher/UI/Pages/Settings/Index.razor
@@ -1,6 +1,7 @@
 @page "/Settings"
 @using System.Globalization
 @using LANCommander.Launcher.Models
+@using LANCommander.SDK.Providers
 @layout AuthenticatedLayout
 @inject NavigationManager NavigationManager
 @inject UpdateService UpdateService
diff --git a/LANCommander.Launcher/UI/ChatWindowLayout.razor b/LANCommander.Launcher/UI/Windows/ChatWindow.razor
similarity index 100%
rename from LANCommander.Launcher/UI/ChatWindowLayout.razor
rename to LANCommander.Launcher/UI/Windows/ChatWindow.razor
diff --git a/LANCommander.Launcher/UI/ChatWindowLayout.razor.css b/LANCommander.Launcher/UI/Windows/ChatWindow.razor.css
similarity index 100%
rename from LANCommander.Launcher/UI/ChatWindowLayout.razor.css
rename to LANCommander.Launcher/UI/Windows/ChatWindow.razor.css
diff --git a/LANCommander.Launcher/UI/MainLayout.razor b/LANCommander.Launcher/UI/Windows/MainWindow.razor
similarity index 93%
rename from LANCommander.Launcher/UI/MainLayout.razor
rename to LANCommander.Launcher/UI/Windows/MainWindow.razor
index d4ecdd45..7dfd2385 100644
--- a/LANCommander.Launcher/UI/MainLayout.razor
+++ b/LANCommander.Launcher/UI/Windows/MainWindow.razor
@@ -68,22 +68,9 @@
         <WindowContent>
             <ErrorHandler Title="@LocalizationService.GetString("LauncherCrashed")">
                 <Body>
-                    <AuthenticatedView NoAutoValidate="false">
-                        <Authenticated>
-                            @Body
+                    @Body
 
-                            @if (Client.Settings.CurrentValue.Debug.EnableScriptDebugging)
-                            {
-                                <PowerShellConsole/>
-                            }
-                            
-                        </Authenticated>
-                        <NotAuthenticated>
-                            <RedirectToLogin />
-                        </NotAuthenticated>
-                    </AuthenticatedView>
-
-                    <ImportHandler @ref="ImportHandler" Progress="OnImportProcess" />
+                    <ImportHandler @ref="ImportHandler" Progress="OnImportProcess"/>
                     <UpdateChecker/>
                     <AntContainer/>
                     <KeepAliveContainer/>
diff --git a/LANCommander.Launcher/UI/MainLayout.razor.css b/LANCommander.Launcher/UI/Windows/MainWindow.razor.css
similarity index 100%
rename from LANCommander.Launcher/UI/MainLayout.razor.css
rename to LANCommander.Launcher/UI/Windows/MainWindow.razor.css
diff --git a/LANCommander.Launcher/UI/_Imports.razor b/LANCommander.Launcher/UI/_Imports.razor
index 610763ae..452bf967 100644
--- a/LANCommander.Launcher/UI/_Imports.razor
+++ b/LANCommander.Launcher/UI/_Imports.razor
@@ -7,5 +7,6 @@
 @using Microsoft.JSInterop
 @using LANCommander.Launcher
 @using LANCommander.Launcher.UI.Components
+@using LANCommander.Launcher.UI.Layouts
 @using LANCommander.Launcher.Services
 @using AntDesign
\ No newline at end of file
diff --git a/LANCommander.SDK/Services/AuthenticationClient.cs b/LANCommander.SDK/Services/AuthenticationClient.cs
index 58940e8f..316c3fd1 100644
--- a/LANCommander.SDK/Services/AuthenticationClient.cs
+++ b/LANCommander.SDK/Services/AuthenticationClient.cs
@@ -19,6 +19,7 @@ public class AuthenticationClient(
     ILogger<AuthenticationClient> logger,
     ITokenProvider tokenProvider,
     IServerConfigurationRefresher configRefresher,
+    ISettingsProvider settingsProvider,
     ApiRequestFactory apiRequestFactory,
     IConnectionClient connectionClient)
 {
@@ -88,7 +89,7 @@ public class AuthenticationClient(
     {
         try
         {
-            apiRequestFactory
+            await apiRequestFactory
                 .Create()
                 .UseRoute("/api/Auth/Logout")
                 .UseAuthenticationToken()
@@ -102,6 +103,12 @@ public class AuthenticationClient(
         }
         
         tokenProvider.SetToken(null);
+        settingsProvider.Update(s =>
+        {
+            s.Authentication.AccessToken = null;
+            s.Authentication.RefreshToken = null;
+            s.Authentication.OfflineModeEnabled = false;
+        });
     }
     
     public async Task RegisterAsync(string username, string password, string passwordConfirmation)
diff --git a/LANCommander.Server/Controllers/Api/DepotController.cs b/LANCommander.Server/Controllers/Api/DepotController.cs
index 334c2f14..9a732bb5 100644
--- a/LANCommander.Server/Controllers/Api/DepotController.cs
+++ b/LANCommander.Server/Controllers/Api/DepotController.cs
@@ -77,9 +77,21 @@ namespace LANCommander.Server.Controllers.Api
 
             var results = await Cache.GetOrSetAsync("Depot/Results", async _ =>
             {
+                var games = await GameService
+                    .AsNoTracking()
+                    .Include(g => g.Media)
+                    .Include(g => g.Collections)
+                    .Include(g => g.Platforms)
+                    .Include(g => g.Tags)
+                    .Include(g => g.Developers)
+                    .Include(g => g.Genres)
+                    .Include(g => g.Publishers)
+                    .Include(g => g.Engine)
+                    .GetAsync();
+                
                 var results = new SDK.Models.DepotResults()
                 {
-                    Games = Mapper.Map<ICollection<DepotGame>>(await GameService.AsNoTracking().GetAsync()),
+                    Games = Mapper.Map<ICollection<DepotGame>>(games),
                     Collections = Mapper.Map<ICollection<SDK.Models.Collection>>(await CollectionService.AsNoTracking().GetAsync()),
                     Companies = Mapper.Map<ICollection<SDK.Models.Company>>(await CompanyService.AsNoTracking().GetAsync()),
                     Engines = Mapper.Map<ICollection<SDK.Models.Engine>>(await EngineService.AsNoTracking().GetAsync()),
diff --git a/LANCommander.Server/docker-compose.yml b/LANCommander.Server/docker-compose.yml
index 7fbfa911..d58d47c2 100644
--- a/LANCommander.Server/docker-compose.yml
+++ b/LANCommander.Server/docker-compose.yml
@@ -12,13 +12,6 @@ services:
       # - WINE=1
     volumes:
       - /path/to/appdata/config:/app/config
-      - /path/to/appdata/Backups:/app/Backups
-      - /path/to/appdata/Launcher:/app/Launcher
-      - /path/to/appdata/Media:/app/Media
-      - /path/to/appdata/Saves:/app/Saves
-      - /path/to/appdata/Servers:/app/Servers
-      - /path/to/appdata/Uploads:/app/Uploads
-      - /path/to/appdata/Updates:/app/Updates
     ports:
       - 1337:1337/tcp   # Webinterface
       - 35891:35891/udp # Beacon Broadcast