diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Game.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor
similarity index 100%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Game.razor
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Game.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor.cs
similarity index 98%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Game.razor.cs
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor.cs
index a8b0ae3..d165867 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Game.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Components;
 
 namespace GameIdeas.BlazorApp.Pages.Games;
 
-public partial class Game
+public partial class Games
 {
     [Inject] private IGameGateway GameGateway { get; set; } = default!;
 
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Game.razor.css b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor.css
similarity index 100%
rename from src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Game.razor.css
rename to src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Games.razor.css
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor
index e51f11b..95627b2 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor
@@ -17,25 +17,28 @@
     @ChildContent
 
     <div class="account-add-container">
-        <AuthorizeView Roles="@GlobalConstants.ADMIN_MEMBER">
-            <Authorized>
-                <div class="add-buttons">
-                    <div class="first-button button">
-                        <svg class="button-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-                            <path d="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
-                        </svg>
-                    </div>
-                    <Select @ref="SelectListAdd" TItem="KeyValuePair<AddType, string>" THeader="object"
-                            ValuesChanged=HandleAddTypeClicked Params=SelectParams Theme="SelectTheme.Navigation">
-                        <div class="second-button button">
+        @if (DisplayAdd)
+        {
+            <AuthorizeView Roles="@GlobalConstants.ADMIN_MEMBER">
+                <Authorized>
+                    <div class="add-buttons">
+                        <div class="first-button button">
                             <svg class="button-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-                                <path d="M1 3H23L12 22" />
+                                <path d="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
                             </svg>
                         </div>
-                    </Select>
-                </div>
-            </Authorized>
-        </AuthorizeView>
+                        <Select @ref="SelectListAdd" TItem="KeyValuePair<AddType, string>" THeader="object"
+                                ValuesChanged=HandleAddTypeClicked Params=SelectParams Theme="SelectTheme.Navigation">
+                            <div class="second-button button">
+                                <svg class="button-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+                                    <path d="M1 3H23L12 22" />
+                                </svg>
+                            </div>
+                        </Select>
+                    </div>
+                </Authorized>
+            </AuthorizeView>
+        }
 
         <UserMenu />
     </div>
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor.cs
index 36b8e79..790268e 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Header/GameHeader.razor.cs
@@ -8,7 +8,8 @@ namespace GameIdeas.BlazorApp.Pages.Games.Header;
 
 public partial class GameHeader : ComponentBase
 {
-    [Parameter] public EventCallback<AddType> AddTypeChanged { get; set; }
+    [Parameter] public bool DisplayAdd { get; set; } = true;
+    [Parameter] public EventCallback<AddType>? AddTypeChanged { get; set; }
     [Parameter] public RenderFragment? ChildContent { get; set; }
 
 
@@ -39,6 +40,6 @@ public partial class GameHeader : ComponentBase
     private async Task HandleAddTypeClicked(IEnumerable<KeyValuePair<AddType, string>> values)
     {
         SelectListAdd?.Close();
-        await AddTypeChanged.InvokeAsync(values.FirstOrDefault().Key);
+        await AddTypeChanged?.InvokeAsync(values.FirstOrDefault().Key)!;
     }
 }
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor
index b46f17a..336d471 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor
@@ -23,9 +23,9 @@
 
                 <AuthorizeView Roles="@GlobalConstants.ADMINISTRATOR">
                     <Authorized>
-                        <div class="menu-element">
+                        <a class="menu-element" href="/Users">
                             @ResourcesKey.UserManager
-                        </div>
+                        </a>
                         <span class="line"></span>
                     </Authorized>
                 </AuthorizeView>
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.css b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.css
index e8a4918..8c8cdbb 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.css
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/UserMenu/UserMenu.razor.css
@@ -36,6 +36,8 @@
 }
 
 .menu-element {
+    color: var(--white);
+    text-decoration: none;
     height: 32px;
     padding: 0 20px;
     align-content: center;
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor
new file mode 100644
index 0000000..880af56
--- /dev/null
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor
@@ -0,0 +1,42 @@
+@page "/Users"
+@using GameIdeas.BlazorApp.Pages.Games.Header
+@using GameIdeas.BlazorApp.Layouts
+@using GameIdeas.BlazorApp.Shared.Components.Popup
+@using GameIdeas.BlazorApp.Shared.Components.Search
+@using GameIdeas.BlazorApp.Shared.Components.SelectSearch
+@using GameIdeas.Shared.Dto
+
+@layout MainLayout
+
+<PageTitle>@ResourcesKey.GamesIdeas</PageTitle>
+
+<GameHeader DisplayAdd="false">
+    <div class="header-content">
+        <SearchInput />
+        <SelectSearch TItem="RoleDto" />
+    </div>
+</GameHeader>
+
+<div class="container">
+    <div class="content">
+        @if (!IsLoading)
+        {
+            @foreach (var user in UsersDto)
+            {
+
+            }
+        }
+        else
+        {
+            @for (int i = 0; i < 20; i++)
+            {
+
+            }
+        }
+
+    </div>
+</div>
+
+<Popup @ref=Popup Closable=false>
+
+</Popup>
\ No newline at end of file
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor.cs
new file mode 100644
index 0000000..339a8fd
--- /dev/null
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor.cs
@@ -0,0 +1,16 @@
+using GameIdeas.BlazorApp.Shared.Components.Popup;
+using GameIdeas.Shared.Dto;
+
+namespace GameIdeas.BlazorApp.Pages.Users;
+
+public partial class Users
+{
+    private Popup? Popup;
+    private bool IsLoading = false;
+    private IEnumerable<UserDto> UsersDto = [];
+
+    private void HandleBackdropClicked()
+    {
+        Popup?.Close();
+    }
+}
\ No newline at end of file
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor.css b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor.css
new file mode 100644
index 0000000..5f28270
--- /dev/null
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Users/Users.razor.css
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/GameIdeas/GameIdeas.Shared/Dto/RoleDto.cs b/src/GameIdeas/GameIdeas.Shared/Dto/RoleDto.cs
new file mode 100644
index 0000000..021d7d5
--- /dev/null
+++ b/src/GameIdeas/GameIdeas.Shared/Dto/RoleDto.cs
@@ -0,0 +1,7 @@
+namespace GameIdeas.Shared.Dto;
+
+public class RoleDto
+{
+    public string Id { get; set; } = string.Empty;
+    public string Name { get; set; } = string.Empty;
+}
diff --git a/src/GameIdeas/GameIdeas.Shared/Dto/UserDto.cs b/src/GameIdeas/GameIdeas.Shared/Dto/UserDto.cs
index 11d6da0..60e1c34 100644
--- a/src/GameIdeas/GameIdeas.Shared/Dto/UserDto.cs
+++ b/src/GameIdeas/GameIdeas.Shared/Dto/UserDto.cs
@@ -7,5 +7,5 @@ public class UserDto
     public int? Id { get; set; }
     public string? Username { get; set; }
     public string? Password { get; set; }
-    public string? RoleId { get; set; }
+    public RoleDto? Role { get; set; }
 }