diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameHeader.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameHeader.razor
deleted file mode 100644
index e02abfc..0000000
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameHeader.razor
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameHeader.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameHeader.razor.cs
deleted file mode 100644
index b57f847..0000000
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Components/GameHeader.razor.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace GameIdeas.BlazorApp.Pages.Games.Components;
-
-public partial class GameHeader
-{
-
-}
\ No newline at end of file
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GamesBase.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GamesBase.razor.cs
index 45197e2..dc671cf 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GamesBase.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/GamesBase.razor.cs
@@ -1,8 +1,6 @@
-using GameIdeas.BlazorApp.Shared.Headers;
-
 namespace GameIdeas.BlazorApp.Pages.Games;
 
 public partial class GamesBase ()
 {
-    private HeaderBase? Header;
+
 }
\ No newline at end of file
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/AccountSetting.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Models/AccountSetting.cs
similarity index 89%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/AccountSetting.cs
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Models/AccountSetting.cs
index 3773818..23e9ce3 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/AccountSetting.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Models/AccountSetting.cs
@@ -1,4 +1,4 @@
-namespace GameIdeas.BlazorApp.Pages.Games;
+namespace GameIdeas.BlazorApp.Pages.Games.Models;
 
 public enum AccountSetting
 {
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/AddType.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Models/AddType.cs
similarity index 79%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/AddType.cs
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Models/AddType.cs
index 014b039..6e34746 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/AddType.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Models/AddType.cs
@@ -1,4 +1,4 @@
-namespace GameIdeas.BlazorApp.Pages.Games;
+namespace GameIdeas.BlazorApp.Pages.Games.Models;
 
 public enum AddType
 {
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Loader.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Loader.razor
deleted file mode 100644
index d8b5aa6..0000000
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Loader.razor
+++ /dev/null
@@ -1 +0,0 @@
-<div class="overlay"> <div class="loader"></div> </div>
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Loader.razor.css b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Loader.razor.css
deleted file mode 100644
index 4814a07..0000000
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Loader.razor.css
+++ /dev/null
@@ -1,31 +0,0 @@
-.overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: var(--semi-black);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 1000;
-}
-
-.loader {
-    border: 8px solid var(--white);
-    border-top: 8px solid var(--violet);
-    border-radius: 50%;
-    width: 60px;
-    height: 60px;
-    animation: spin 1s linear infinite;
-}
-
-@keyframes spin {
-    0% {
-        transform: rotate(0deg);
-    }
-
-    100% {
-        transform: rotate(360deg);
-    }
-}
\ No newline at end of file
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Headers/HeaderBase.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Headers/HeaderBase.razor
index 7db57d2..d6c82f0 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Headers/HeaderBase.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Headers/HeaderBase.razor
@@ -1,5 +1,6 @@
-@using GameIdeas.BlazorApp.Shared.Components.Dropdown
-@using GameIdeas.BlazorApp.Pages.Games
+@using GameIdeas.BlazorApp.Pages.Games
+@using GameIdeas.BlazorApp.Pages.Games.Models
+@using GameIdeas.BlazorApp.Shared.Components.Dropdown
 @using GameIdeas.Resources
 
 <div class="header-tab">
@@ -31,7 +32,7 @@
                              Theme="DropdownTheme.Navigation" />
         </div>
         <div class="account-container">
-            <div class="icon-container" @onclick="HandleAccountClicked">
+            <div class="icon-container">
                 <svg class="account-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
                     <path d="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z" />
                 </svg>
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Headers/HeaderBase.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Headers/HeaderBase.razor.cs
index 220b578..722958a 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Headers/HeaderBase.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Headers/HeaderBase.razor.cs
@@ -1,4 +1,4 @@
-using GameIdeas.BlazorApp.Pages.Games;
+using GameIdeas.BlazorApp.Pages.Games.Models;
 using GameIdeas.BlazorApp.Shared.Components.Dropdown;
 using GameIdeas.Resources;
 using Microsoft.AspNetCore.Components;