diff --git a/.idea/JetClient/state.xml b/.idea/JetClient/state.xml
index 497196b1..ad7a6528 100644
--- a/.idea/JetClient/state.xml
+++ b/.idea/JetClient/state.xml
@@ -162,6 +162,22 @@
                       <option name="sortWeight" value="7000000" />
                       <option name="url" value="http://localhost:8888/logout" />
                     </requestState>
+                    <requestState>
+                      <option name="description" value="Pobierz użytkowników po wzorcu" />
+                      <option name="id" value="d3fddbeb-2bd5-4975-a75c-f5563c16fa00" />
+                      <option name="method" value="GET" />
+                      <option name="name" value="Get Usernames By Regex" />
+                      <option name="pathVariables">
+                        <list>
+                          <pathVariableState>
+                            <option name="key" value="regexUsername" />
+                            <option name="value" value="user" />
+                            </pathVariableState>
+                        </list>
+                      </option>
+                      <option name="sortWeight" value="8000000" />
+                      <option name="url" value="http://localhost:8888/api/v1/authorized/user/find/{regexUsername}" />
+                    </requestState>
                     <requestState>
                       <option name="description" value="Pobierz zdjęcie po username" />
                       <option name="id" value="dc05ba37-3be6-4154-82db-412bfc62f380" />
@@ -178,6 +194,14 @@
                       <option name="sortWeight" value="8000000" />
                       <option name="url" value="http://localhost:8888/api/v1/authorized/user/photo/username/{username}" />
                     </requestState>
+                    <requestState>
+                      <option name="description" value="Usuwa usera o wskazanym ID" />
+                      <option name="id" value="8175a312-36d8-47aa-8adc-9a72663785bc" />
+                      <option name="method" value="DELETE" />
+                      <option name="name" value="Delete user" />
+                      <option name="sortWeight" value="9000000" />
+                      <option name="url" value="http://localhost:8888/api/v1/authorized/admin/user/delete/2" />
+                    </requestState>
                   </list>
                 </option>
                 <option name="sortWeight" value="1000000" />
@@ -204,7 +228,7 @@
                     <requestState>
                       <option name="body">
                         <bodyState>
-                          <option name="raw" value="{&#10;//  &quot;userId&quot;: 2,&#10;//  &quot;gameId&quot;: 1,&#10;//  &quot;role&quot;: &quot;GAMEMASTER&quot;,&#10;  &quot;userId&quot;: 3,&#10;  &quot;gameId&quot;: 1,&#10;  &quot;role&quot;: &quot;PLAYER&quot;&#10;}" />
+                          <option name="raw" value="{&#10;//  &quot;userId&quot;: 1,&#10;//  &quot;gameId&quot;: 2,&#10;//  &quot;role&quot;: &quot;GAMEMASTER&quot;,&#10;  &quot;userId&quot;: 2,&#10;  &quot;gameId&quot;: 3,&#10;  &quot;role&quot;: &quot;PLAYER&quot;&#10;}" />
                           <option name="type" value="JSON" />
                         </bodyState>
                       </option>
@@ -215,6 +239,20 @@
                       <option name="sortWeight" value="1500000" />
                       <option name="url" value="http://localhost:8888/api/v1/authorized/game/addUserToGame" />
                     </requestState>
+                    <requestState>
+                      <option name="body">
+                        <bodyState>
+                          <option name="raw" value="[&#10;  {&#10;    &quot;userId&quot;: 4,&#10;    &quot;gameId&quot;: 1,&#10;    &quot;role&quot;: &quot;PLAYER&quot;&#10;  },&#10;    {&#10;        &quot;userId&quot;: 5,&#10;        &quot;gameId&quot;: 1,&#10;        &quot;role&quot;: &quot;PLAYER&quot;&#10;    }&#10;]" />
+                          <option name="type" value="JSON" />
+                        </bodyState>
+                      </option>
+                      <option name="description" value="Dodaje użytkowników do gry z odpowiednią rolą" />
+                      <option name="id" value="d5229378-dbb2-482a-916a-3894e1558cc4" />
+                      <option name="method" value="POST" />
+                      <option name="name" value="Dodaj użytkowników do gry" />
+                      <option name="sortWeight" value="1750000" />
+                      <option name="url" value="http://localhost:8888/api/v1/authorized/game/addUsersToGame" />
+                    </requestState>
                     <requestState>
                       <option name="description" value="Wyświatla wszystkie gry" />
                       <option name="id" value="dc6f4f40-de60-44a4-ad77-bd68c91e01d2" />
@@ -229,7 +267,7 @@
                       <option name="method" value="GET" />
                       <option name="name" value="Gracze danej gry" />
                       <option name="sortWeight" value="3000000" />
-                      <option name="url" value="http://localhost:8888/api/v1/authorized/game/allPlayers/1" />
+                      <option name="url" value="http://localhost:8888/api/v1/authorized/game/allPlayers/3" />
                     </requestState>
                     <requestState>
                       <option name="body">
@@ -2105,6 +2143,68 @@
                                   </option>
                                   <option name="sortWeight" value="2000000" />
                                 </folderState>
+                                <folderState>
+                                  <option name="id" value="709a58b8-efe6-450f-9bc4-237c1dd205da" />
+                                  <option name="name" value="Classes" />
+                                  <option name="requests">
+                                    <list>
+                                      <requestState>
+                                        <option name="body">
+                                          <bodyState>
+                                            <option name="raw" value="{&#10;  classLevel: 1,&#10;  characterId: 1,&#10;  classId: 1&#10;}" />
+                                            <option name="type" value="JSON" />
+                                          </bodyState>
+                                        </option>
+                                        <option name="description" value="Dodaje powiązanie klasy z daną postacią" />
+                                        <option name="id" value="4f041235-dbd7-4cd4-8c29-cab4755cdb25" />
+                                        <option name="method" value="POST" />
+                                        <option name="name" value="Dodaj klasę postaci" />
+                                        <option name="sortWeight" value="1000000" />
+                                        <option name="url" value="http://localhost:8888/api/v1/authorized/games/cpRed/characters/classes/create" />
+                                      </requestState>
+                                      <requestState>
+                                        <option name="description" value="Zwraca wszystkie klasy wskazanej postaci po jej ID" />
+                                        <option name="id" value="fc056619-fa0c-40a2-89dc-971708765476" />
+                                        <option name="method" value="GET" />
+                                        <option name="name" value="Pobierz klasy postaci po ID postaci" />
+                                        <option name="sortWeight" value="2000000" />
+                                        <option name="url" value="http://localhost:8888/api/v1/authorized/games/cpRed/characters/classes/3" />
+                                      </requestState>
+                                      <requestState>
+                                        <option name="description" value="Zwraca listę wszysktki powiązań postaci z klasą" />
+                                        <option name="id" value="338fb3e2-b7da-4b16-adeb-05f9c49d59d2" />
+                                        <option name="method" value="GET" />
+                                        <option name="name" value="Pobierz wszystkie klasy postaci dla Admina" />
+                                        <option name="sortWeight" value="3000000" />
+                                        <option name="url" value="http://localhost:8888/api/v1/authorized/admin/games/cpRed/characters/classes/all" />
+                                      </requestState>
+                                      <requestState>
+                                        <option name="body">
+                                          <bodyState>
+                                            <option name="raw" value="{&#10;  classLevel: 5&#10;}" />
+                                            <option name="type" value="JSON" />
+                                          </bodyState>
+                                        </option>
+                                        <option name="description" value="Pozwala zmienić level danej clasy postaci" />
+                                        <option name="id" value="8af763e5-f529-433d-9890-703c49055f71" />
+                                        <option name="method" value="PUT" />
+                                        <option name="name" value="Modyfikuj klasę danej postaci" />
+                                        <option name="sortWeight" value="4000000" />
+                                        <option name="url" value="http://localhost:8888/api/v1/authorized/games/cpRed/characters/classes/update/5" />
+                                      </requestState>
+                                      <requestState>
+                                        <option name="description" value="Usuwa klasę dla danej postaci" />
+                                        <option name="id" value="39fddd48-edcc-46a4-9ebc-9523cf75624c" />
+                                        <option name="method" value="DELETE" />
+                                        <option name="name" value="Usuń klasę danej postaci" />
+                                        <option name="sortWeight" value="5000000" />
+                                        <option name="url" value="http://localhost:8888/api/v1/authorized/games/cpRed/characters/classes/delete/6" />
+                                      </requestState>
+                                    </list>
+                                  </option>
+                                  <option name="sortWeight" value="1000000" />
+                                </folderState>
+
                                 <folderState>
                                   <option name="id" value="81470128-3c31-4765-b74f-ab9d6ff1a24e" />
                                   <option name="name" value="Stats" />
@@ -3425,6 +3525,7 @@
                               <list>
                                 <pathVariableState>
                                   <option name="key" value="schedulerId" />
+                                  <option name="value" value="1" />
                                 </pathVariableState>
                               </list>
                             </option>
@@ -3504,7 +3605,7 @@
                     <requestState>
                       <option name="body">
                         <bodyState>
-                          <option name="raw" value="{&#10;  &quot;schedulerId&quot;: 2,&#10;  &quot;start&quot;: &quot;2025-12-20T18:00:00&quot;,&#10;  &quot;end&quot;: &quot;2025-12-20T22:00:00&quot;&#10;}" />
+                          <option name="raw" value="{&#10;  &quot;schedulerId&quot;: 1,&#10;  &quot;start&quot;: &quot;2025-12-20T18:00:00&quot;,&#10;  &quot;end&quot;: &quot;2025-12-20T22:00:00&quot;&#10;}" />
                           <option name="type" value="JSON" />
                         </bodyState>
                       </option>
diff --git a/src/main/java/dev/goral/rpghandyhelper/RpgHandyHelperApplication.java b/src/main/java/dev/goral/rpghandyhelper/RpgHandyHelperApplication.java
index 31cd1fed..45b80a8c 100644
--- a/src/main/java/dev/goral/rpghandyhelper/RpgHandyHelperApplication.java
+++ b/src/main/java/dev/goral/rpghandyhelper/RpgHandyHelperApplication.java
@@ -9,7 +9,7 @@ public class RpgHandyHelperApplication {
 
     public static void main(String[] args) {
         // Initialize the logger service
-        LoggerService.logInfo("Application is started");
+        LoggerService.logInfo("Application is starting");
         SpringApplication.run(RpgHandyHelperApplication.class, args);
         // Log the application start
         LoggerService.logInfo("Application has started successfully");
diff --git a/src/main/java/dev/goral/rpghandyhelper/content/ContentController.java b/src/main/java/dev/goral/rpghandyhelper/content/ContentController.java
index a331eefb..01c53688 100644
--- a/src/main/java/dev/goral/rpghandyhelper/content/ContentController.java
+++ b/src/main/java/dev/goral/rpghandyhelper/content/ContentController.java
@@ -82,4 +82,41 @@ public String getNotes() {
         System.out.println("ContentController: getNotes()");
         return "home/notes";
     }
+
+    @GetMapping("/home/create-game")
+    public String getCreateGame() {
+        System.out.println("ContentController: getCreateGame()");
+        return "home/createGame";
+    }
+   // ADMIN PAGES
+
+    @GetMapping("/admin")
+    public String getAdmin() {
+        System.out.println("ContentController: getAdmin()");
+        return "admin/admin";
+    }
+
+    @GetMapping("/admin/users")
+    public String getAdminUsers() {
+        System.out.println("ContentController: getAdminUsers()");
+        return "admin/users";
+    }
+
+    @GetMapping("/admin/user/edit")
+    public String getAdminUserEdit() {
+        System.out.println("ContentController: getAdminUserEdit()");
+        return "admin/userEdit";
+    }
+
+    @GetMapping("/admin/user/myPassword")
+    public String getAdminUserMyPassword() {
+        System.out.println("ContentController: getAdminUserMyPassword()");
+        return "admin/changePasswordAdmin";
+    }
+
+    @GetMapping("/home/games")
+    public String getgames() {
+        System.out.println("ContentController: getgames()");
+        return "home/games";
+    }
 }
diff --git a/src/main/java/dev/goral/rpghandyhelper/game/Game.java b/src/main/java/dev/goral/rpghandyhelper/game/Game.java
index 7c73c598..998fa584 100644
--- a/src/main/java/dev/goral/rpghandyhelper/game/Game.java
+++ b/src/main/java/dev/goral/rpghandyhelper/game/Game.java
@@ -35,7 +35,7 @@ public class Game {
     @JoinColumn(
             name = "user_id",
             referencedColumnName = "id",
-            nullable = false
+            nullable = true
     )
     private User owner;
 
diff --git a/src/main/java/dev/goral/rpghandyhelper/game/GameController.java b/src/main/java/dev/goral/rpghandyhelper/game/GameController.java
index 1909a2f0..fb6fbf06 100644
--- a/src/main/java/dev/goral/rpghandyhelper/game/GameController.java
+++ b/src/main/java/dev/goral/rpghandyhelper/game/GameController.java
@@ -6,6 +6,7 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -42,6 +43,11 @@ public Map<String, Object> addUserToGame(@RequestBody AddUserToGameRequest reque
         return gameService.addUserToGame(request);
     }
 
+    @PostMapping(path = "/game/addUsersToGame")
+    public Map<String, Object> addUsersToGame(@RequestBody List<AddUserToGameRequest> requests) {
+        return gameService.addUsersToGame(requests);
+    }
+
     @DeleteMapping(path = "/game/deleteUserFromGame")
     public Map<String, Object> deleteUserToGame(@RequestBody DeleteUserFromGameRequest request) {
         return gameService.deleteUserFromGame(request);
diff --git a/src/main/java/dev/goral/rpghandyhelper/game/GameRepository.java b/src/main/java/dev/goral/rpghandyhelper/game/GameRepository.java
index 669f0cf7..d77f6b01 100644
--- a/src/main/java/dev/goral/rpghandyhelper/game/GameRepository.java
+++ b/src/main/java/dev/goral/rpghandyhelper/game/GameRepository.java
@@ -1,11 +1,16 @@
 package dev.goral.rpghandyhelper.game;
 
+import dev.goral.rpghandyhelper.user.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
+
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface GameRepository extends JpaRepository<Game, Long> {
     Optional<Game> findGameById(Long id);
     Optional<Game> findGameByName(String name);
+
+    List<Game> findAllByOwner(User user);
 }
\ No newline at end of file
diff --git a/src/main/java/dev/goral/rpghandyhelper/game/GameService.java b/src/main/java/dev/goral/rpghandyhelper/game/GameService.java
index a28581f0..29db7da3 100644
--- a/src/main/java/dev/goral/rpghandyhelper/game/GameService.java
+++ b/src/main/java/dev/goral/rpghandyhelper/game/GameService.java
@@ -39,7 +39,7 @@ public Map<String, Object> getAllGames() {
                         game.getId(),
                         game.getName(),
                         game.getDescription(),
-                        game.getOwner().getId(),
+                        game.getOwner() != null ? game.getOwner().getId() : null,
                         game.getRpgSystem().getId(),
                         game.getStatus().toString()
                 ))
@@ -59,7 +59,7 @@ public Map<String, Object> getGame(Long gameId) {
                         game.getId(),
                         game.getName(),
                         game.getDescription(),
-                        game.getOwner().getId(),
+                        game.getOwner() != null ? game.getOwner().getId() : null,
                         game.getRpgSystem().getId()
                 ))
                 .orElse(null);
@@ -181,8 +181,10 @@ public Map<String, Object> createGame(Game game) {
         gameUsers.setGame(game);
         gameUsers.setRole(GameUsersRole.GAMEMASTER);
         gameUsersRepository.save(gameUsers);
+        Map <String, Object> response = CustomReturnables.getOkResponseMap("Gra została utworzona.");
+        response.put("gameId", game.getId());
 
-        return CustomReturnables.getOkResponseMap("Gra została utworzona.");
+        return response;
     }
 
     public Map<String, Object> addUserToGame(AddUserToGameRequest request) {
@@ -225,6 +227,19 @@ public Map<String, Object> addUserToGame(AddUserToGameRequest request) {
         return CustomReturnables.getOkResponseMap("Użytkownik został dodany do gry.");
     }
 
+    public Map<String, Object> addUsersToGame(List<AddUserToGameRequest> requests) {
+
+        if (requests == null || requests.isEmpty()) {
+            throw new IllegalArgumentException("Brak danych do dodania użytkowników do gry.");
+        }
+
+        for (AddUserToGameRequest request : requests) {
+            addUserToGame(request);
+        }
+
+        return CustomReturnables.getOkResponseMap("Użytkownicy zostali dodani do gry.");
+    }
+
     public Map<String, Object> deleteUserFromGame(DeleteUserFromGameRequest request) {
 
         if ( request.getGameId() == null || request.getUserId() == null) {
@@ -449,4 +464,82 @@ public Map<String, Object> updateGameUserRole(Long gameUserId, Map<String, Strin
         return CustomReturnables.getOkResponseMap("Rola użytkownika gry została zaktualizowana.");
 
     }
+
+    public void deleteUserFromAllGames(Long id) {
+        System.out.println("Check 1");
+        User user = userRepository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException("Użytkownik o podanym ID nie istnieje."));
+
+        // Usuwanie postaci CP Red powiązanych z użytkownikiem
+        List<CpRedCharacters> userCharacters = cpRedCharactersRepository.findByUserId_Id(id);
+        for (CpRedCharacters character : userCharacters) {
+            character.setUser(null);
+            cpRedCharactersRepository.save(character);
+        }
+
+        System.out.println("Check 2");
+        List<GameUsers> userGames = gameUsersRepository.findAllByUserId(user.getId());
+        List<Game> userOwnedGames = gameRepository.findAllByOwner(user);
+        if (userGames.isEmpty() && userOwnedGames.isEmpty()) {
+            return;
+        }
+        System.out.println("Check 3");
+        if (!userGames.isEmpty()) {
+            System.out.println("Check 3.1");
+            for (GameUsers userGame : userGames) {
+                System.out.println("Check 3.2 - for start");
+                Game game = userGame.getGame();
+                if (userGame.getRole() == GameUsersRole.GAMEMASTER) {
+                    System.out.println("Check 3.3");
+                    // Sprawdź, czy są inni GM'owie w grze
+                    List<GameUsers> gameGameMasters = gameUsersRepository.findAllByGameIdAndRole(game.getId(), GameUsersRole.GAMEMASTER);
+                    if (gameGameMasters.size() == 1) {
+                        System.out.println("Check 3.4");
+                        GameUsers newGameMaster = gameUsersRepository.findFirstByGameIdAndRole(game.getId(), GameUsersRole.PLAYER);
+                        // Jeśli nie ma graczy, to zmień grę na DELETED
+                        if (newGameMaster == null) {
+                            System.out.println("Check 3.5");
+                            game.setStatus(GameStatus.DELETED);
+                        } else {
+                            System.out.println("Check 3.6");
+                            newGameMaster.setRole(GameUsersRole.GAMEMASTER);
+                            gameUsersRepository.save(newGameMaster);
+                        }
+                    }
+                }
+                System.out.println("Check 3.7");
+                gameRepository.save(game);
+                gameUsersRepository.delete(userGame);
+                System.out.println("Check 3.8 - for end");
+            }
+        }
+        System.out.println("Check 4");
+        if (!userOwnedGames.isEmpty()) {
+            System.out.println("Check 4.1");
+            for (Game ownedGame : userOwnedGames) {
+                System.out.println("Check 4.2 - for start");
+                if (ownedGame.getOwner().getId().equals(user.getId())) {
+                    System.out.println("Check 4.3");
+                    GameUsers newOwner = gameUsersRepository.findFirstByGameIdAndRole(ownedGame.getId(), GameUsersRole.GAMEMASTER);
+                    if (newOwner == null) {
+                        System.out.println("Check 4.4");
+                        newOwner = gameUsersRepository.findFirstByGameIdAndRole(ownedGame.getId(), GameUsersRole.PLAYER);
+                        if (newOwner == null) {
+                            System.out.println("Check 4.5");
+                            ownedGame.setOwner(null);
+                            ownedGame.setStatus(GameStatus.DELETED);
+                        }
+                    }
+                    System.out.println("Check 4.6");
+                    if (newOwner != null) {
+                        System.out.println("Check 4.7");
+                        ownedGame.setOwner(newOwner.getUser());
+                    }
+                }
+                gameRepository.save(ownedGame);
+                System.out.println("Check 4.8 - for end");
+            }
+        }
+        System.out.println("Check 5");
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/goral/rpghandyhelper/game/gameUsers/GameUsersRepository.java b/src/main/java/dev/goral/rpghandyhelper/game/gameUsers/GameUsersRepository.java
index 38fe9b98..d7faa661 100644
--- a/src/main/java/dev/goral/rpghandyhelper/game/gameUsers/GameUsersRepository.java
+++ b/src/main/java/dev/goral/rpghandyhelper/game/gameUsers/GameUsersRepository.java
@@ -1,6 +1,7 @@
 package dev.goral.rpghandyhelper.game.gameUsers;
 
 import dev.goral.rpghandyhelper.game.Game;
+import dev.goral.rpghandyhelper.user.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -36,5 +37,9 @@ public interface GameUsersRepository extends JpaRepository<GameUsers, Long> {
     GameUsers findByGameIdAndUserId(Long gameId, Long id);
 
     GameUsers findByUserId(Long userId);
+
+    GameUsers findFirstByGameIdAndRole(Long id, GameUsersRole gameUsersRole);
+
+    List<GameUsers> findAllByGameIdAndRole(Long id, GameUsersRole gameUsersRole);
 }
 
diff --git a/src/main/java/dev/goral/rpghandyhelper/notes/GameNoteService.java b/src/main/java/dev/goral/rpghandyhelper/notes/GameNoteService.java
index 6d455cba..fa6e8227 100644
--- a/src/main/java/dev/goral/rpghandyhelper/notes/GameNoteService.java
+++ b/src/main/java/dev/goral/rpghandyhelper/notes/GameNoteService.java
@@ -3,6 +3,7 @@
 import dev.goral.rpghandyhelper.game.Game;
 import dev.goral.rpghandyhelper.game.GameStatus;
 import dev.goral.rpghandyhelper.game.gameUsers.GameUsersRepository;
+import dev.goral.rpghandyhelper.logs.LoggerService;
 import dev.goral.rpghandyhelper.security.CustomReturnables;
 import dev.goral.rpghandyhelper.security.exceptions.ResourceNotFoundException;
 import dev.goral.rpghandyhelper.user.User;
@@ -319,4 +320,20 @@ public Map<String, Object> getGameNotesForGame(User loggedInUser, Long gameId) {
 
         return response;
     }
+
+    public void deleteAllByUserId(Long id) {
+        User user = userRepository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException("Użytkownik o id " + id + " nie istnieje."));
+
+        List<GameNote> gameNotes = gameNoteRepository.findByUserId(user.getId());
+        if (gameNotes.isEmpty()) {
+            return;
+        }
+        for (GameNote gameNote : gameNotes) {
+            if (gameNote.getUser().getId().equals(user.getId())) {
+                gameNoteRepository.delete(gameNote);
+            }
+        }
+        LoggerService.logInfo("Usunięto wszystkie notatki użytkownika: " + user.getUsername() + " (ID: " + user.getId() + ")");
+    }
 }
diff --git a/src/main/java/dev/goral/rpghandyhelper/rpgSystems/cpRed/characters/CpRedCharactersRepository.java b/src/main/java/dev/goral/rpghandyhelper/rpgSystems/cpRed/characters/CpRedCharactersRepository.java
index fe6904be..e30f715a 100644
--- a/src/main/java/dev/goral/rpghandyhelper/rpgSystems/cpRed/characters/CpRedCharactersRepository.java
+++ b/src/main/java/dev/goral/rpghandyhelper/rpgSystems/cpRed/characters/CpRedCharactersRepository.java
@@ -19,6 +19,5 @@ public interface CpRedCharactersRepository extends JpaRepository<CpRedCharacters
     Long countByUserIdAndGameId(@Param("userId") Long userId, @Param("gameId") Long gameId);
 
 
-
-
+    List<CpRedCharacters> findByUserId_Id(Long id);
 }
diff --git a/src/main/java/dev/goral/rpghandyhelper/scheduler/controller/SchedulerController.java b/src/main/java/dev/goral/rpghandyhelper/scheduler/controller/SchedulerController.java
index 577590d2..89f6dc3b 100644
--- a/src/main/java/dev/goral/rpghandyhelper/scheduler/controller/SchedulerController.java
+++ b/src/main/java/dev/goral/rpghandyhelper/scheduler/controller/SchedulerController.java
@@ -118,6 +118,29 @@ public Map<String, Object> sendFinalDecisionMails(
      =========================== PLAYER AVAILABILITY ===========================
      */
 
+    @GetMapping("/pendingSchedulers")
+    public Map<String, Object> getPendingSchedulers(
+            @AuthenticationPrincipal User currentUser
+    ) {
+        List<SchedulerResponse> pendingSchedulers = schedulerService.getPendingSchedulers(currentUser);
+
+        if (pendingSchedulers.isEmpty()) {
+            return CustomReturnables.getOkResponseMap("Brak niewypełnionych schedulerów.");
+        }
+
+        Map<String, Object> response = CustomReturnables.getOkResponseMap("Pobrano listę niewypełnionych schedulerów.");
+        response.put("pendingSchedulers", pendingSchedulers);
+        return response;
+    }
+
+    @GetMapping("/nextSession/{gameId}")
+    public Map<String, Object> getNextSession(
+            @PathVariable Long gameId,
+            @AuthenticationPrincipal User currentUser
+    ) {
+        return schedulerService.getNextSession(currentUser, gameId);
+    }
+
     @PostMapping("/submitAvailability")
     public Map<String, Object> submitAvailability(
             @RequestBody SubmitAvailabilityRequest request,
diff --git a/src/main/java/dev/goral/rpghandyhelper/scheduler/dto/common/NextSession.java b/src/main/java/dev/goral/rpghandyhelper/scheduler/dto/common/NextSession.java
new file mode 100644
index 00000000..f3120834
--- /dev/null
+++ b/src/main/java/dev/goral/rpghandyhelper/scheduler/dto/common/NextSession.java
@@ -0,0 +1,16 @@
+package dev.goral.rpghandyhelper.scheduler.dto.common;
+
+import lombok.*;
+
+import java.time.LocalTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class NextSession {
+    String sessionName;
+    String gameName;
+    LocalTime startTime;
+}
diff --git a/src/main/java/dev/goral/rpghandyhelper/scheduler/repository/SchedulerRepository.java b/src/main/java/dev/goral/rpghandyhelper/scheduler/repository/SchedulerRepository.java
index 5674824c..b8de07ac 100644
--- a/src/main/java/dev/goral/rpghandyhelper/scheduler/repository/SchedulerRepository.java
+++ b/src/main/java/dev/goral/rpghandyhelper/scheduler/repository/SchedulerRepository.java
@@ -3,6 +3,8 @@
 import dev.goral.rpghandyhelper.scheduler.entity.Scheduler;
 import dev.goral.rpghandyhelper.scheduler.enums.SchedulerStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -11,4 +13,8 @@
 public interface SchedulerRepository extends JpaRepository<Scheduler, Long> {
     List<Scheduler> findByGameId(Long gameId);
     List<Scheduler> findAllByGameIdAndStatus(Long gameId, SchedulerStatus schedulerStatus);
+    List<Scheduler> findAllByParticipants_Player_Id(Long id);
+    @Query("SELECT s FROM Scheduler s JOIN s.participants p WHERE p.player.id = :participantId")
+    List<Scheduler> findAllBySchedulerParticipantId(@Param("participantId") Long participantId);
+
 }
diff --git a/src/main/java/dev/goral/rpghandyhelper/scheduler/service/SchedulerService.java b/src/main/java/dev/goral/rpghandyhelper/scheduler/service/SchedulerService.java
index 043af2e3..1da154bd 100644
--- a/src/main/java/dev/goral/rpghandyhelper/scheduler/service/SchedulerService.java
+++ b/src/main/java/dev/goral/rpghandyhelper/scheduler/service/SchedulerService.java
@@ -4,6 +4,7 @@
 import dev.goral.rpghandyhelper.game.GameRepository;
 import dev.goral.rpghandyhelper.game.GameStatus;
 import dev.goral.rpghandyhelper.game.gameUsers.GameUsersRepository;
+import dev.goral.rpghandyhelper.scheduler.dto.common.NextSession;
 import dev.goral.rpghandyhelper.scheduler.dto.common.TimeRangeDto;
 import dev.goral.rpghandyhelper.scheduler.dto.request.CreateSchedulerRequest;
 import dev.goral.rpghandyhelper.scheduler.dto.request.EditSchedulerRequest;
@@ -938,6 +939,14 @@ public void editAvailability(SubmitAvailabilityRequest request, User currentUser
         schedulerRepository.save(scheduler);
     }
 
+    /**
+     * Gets the availability of all players for a given scheduler.
+     *
+     * @param schedulerId The ID of the scheduler.
+     * @param currentUser   The user who is requesting the availability.
+     * @return A list of {@link PlayerAvailabilityResponse} containing the availability of each player.
+     * @throws IllegalStateException If the user does not have access to the scheduler or if the scheduler is not found.
+     */
     public List<PlayerAvailabilityResponse> getAllPlayerAvailability(Long schedulerId, User currentUser) {
         User user = userRepository.findByUsername(currentUser.getUsername())
                 .orElseThrow(() -> new IllegalStateException("Nie znaleziono użytkownika " + currentUser.getUsername()));
@@ -964,35 +973,124 @@ public List<PlayerAvailabilityResponse> getAllPlayerAvailability(Long schedulerI
         return responses;
     }
 
-public Map<String, Object> getFutureFinalDecisionsForGame(User loggedUser, Long gameId) {
-    User user = userRepository.findByUsername(loggedUser.getUsername())
-            .orElseThrow(() -> new IllegalStateException("Nie znaleziono użytkownika"));
+    /**
+     * Gets future final decisions for a game.
+     *
+     * @param loggedUser The user who is logged in.
+     * @param gameId The ID of the game.
+     * @return A map containing future final decisions for the game.
+     * @throws IllegalStateException If the user does not have access to the game or if the user is not found.
+     */
+    public Map<String, Object> getFutureFinalDecisionsForGame(User loggedUser, Long gameId) {
+        User user = userRepository.findByUsername(loggedUser.getUsername())
+                .orElseThrow(() -> new IllegalStateException("Nie znaleziono użytkownika"));
+
+        if (!gameUsersRepository.existsByGameIdAndUserId(gameId, user.getId())) {
+            throw new IllegalStateException("Nie masz dostępu do tej gry");
+        }
+
+        List<Scheduler> schedulers = schedulerRepository.findAllByGameIdAndStatus(gameId, SchedulerStatus.FINALIZED);
 
-    if (!gameUsersRepository.existsByGameIdAndUserId(gameId, user.getId())) {
-        throw new IllegalStateException("Nie masz dostępu do tej gry");
+        if (schedulers.isEmpty()) {
+            return CustomReturnables.getOkResponseMap("Nie znaleziono przyszłych decyzji harmonogramów dla tej gry.");
+        }
+
+        List<SchedulerResponse> responses = schedulers.stream()
+                .filter(scheduler -> scheduler.getFinalDecision() != null &&
+                        scheduler.getFinalDecision().getStart().isAfter(LocalDateTime.now()))
+                .map(SchedulerResponseMapper::mapToDto)
+                .toList();
+
+        List<SchedulerResponse.FinalDecisionDto> finalDecisions = responses.stream()
+                .map(SchedulerResponse::getFinalDecision)
+                .filter(Objects::nonNull)
+                .toList();
+
+        Map<String, Object> response = CustomReturnables.getOkResponseMap("Pobrano przyszłe decyzje harmonogramów dla gry.");
+        response.put("futureGames", finalDecisions);
+        return response;
     }
 
-    List<Scheduler> schedulers = schedulerRepository.findAllByGameIdAndStatus(gameId, SchedulerStatus.FINALIZED);
+    /**
+     * Gets all pending schedulers for the current user.
+     *
+     * @param currentUser The currently logged-in user.
+     * @return A list of {@link SchedulerResponse} containing pending schedulers.
+     * @throws IllegalStateException If the user is not found.
+     */
+    public List<SchedulerResponse> getPendingSchedulers(User currentUser) {
+        User user = userRepository.findByUsername(currentUser.getUsername())
+                .orElseThrow(() -> new IllegalStateException("Nie znaleziono użytkownika"));
+
+        List<Scheduler> schedulers = schedulerRepository.findAllBySchedulerParticipantId(user.getId());
 
-    if (schedulers.isEmpty()) {
-        return CustomReturnables.getOkResponseMap("Nie znaleziono przyszłych decyzji harmonogramów dla tej gry.");
+        return schedulers.stream()
+                .filter(scheduler -> scheduler.getParticipants().stream()
+                        .anyMatch(participant -> participant.getPlayer().getId().equals(user.getId()) &&
+                                (participant.getAvailabilitySlots() == null || participant.getAvailabilitySlots().isEmpty())))
+                .map(SchedulerResponseMapper::mapToDto)
+                .toList();
+    }
+
+    /**
+     * Gets the next session for a given game.
+     *
+     * @param currentUser The currently logged-in user.
+     * @param gameId The ID of the game.
+     * @return A map containing the name and date of the next session.
+     * @throws IllegalStateException If the user does not have access to the game or if the user is not found.
+     */
+    public Map<String, Object> getNextSession(User currentUser, Long gameId) {
+        User user = userRepository.findByUsername(currentUser.getUsername())
+                .orElseThrow(() -> new IllegalStateException("Nie znaleziono użytkownika"));
+
+        if (!gameUsersRepository.existsByGameIdAndUserId(gameId, user.getId())) {
+            throw new IllegalStateException("Nie masz dostępu do tej gry");
+        }
+
+        List<Scheduler> schedulers = schedulerRepository.findAllByGameIdAndStatus(gameId, SchedulerStatus.FINALIZED);
+
+        Scheduler nextSession = schedulers.stream()
+                .filter(scheduler -> scheduler.getFinalDecision() != null &&
+                        scheduler.getFinalDecision().getStart().isAfter(LocalDateTime.now()))
+                .min(Comparator.comparing(s -> s.getFinalDecision().getStart()))
+                .orElse(null);
+
+        if (nextSession == null) {
+            return CustomReturnables.getOkResponseMap("Brak nadchodzących sesji.");
+        }
+
+        NextSession nextSessionDto = new NextSession();
+        nextSessionDto.setSessionName(nextSession.getTitle());
+        nextSessionDto.setGameName(nextSession.getGame().getName());
+        nextSessionDto.setStartTime(nextSession.getFinalDecision().getStart().toLocalTime());
+
+        Map<String, Object> response = CustomReturnables.getOkResponseMap("Pobrano najbliższą sesję.");
+        response.put("nextSession", nextSessionDto);
+        return response;
     }
 
-    List<SchedulerResponse> responses = schedulers.stream()
-            .filter(scheduler -> scheduler.getFinalDecision() != null &&
-                    scheduler.getFinalDecision().getStart().isAfter(LocalDateTime.now()))
-            .map(SchedulerResponseMapper::mapToDto)
-            .toList();
-
-    List<SchedulerResponse.FinalDecisionDto> finalDecisions = responses.stream()
-            .map(SchedulerResponse::getFinalDecision)
-            .filter(Objects::nonNull)
-            .toList();
-
-    Map<String, Object> response = CustomReturnables.getOkResponseMap("Pobrano przyszłe decyzje harmonogramów dla gry.");
-    response.put("futureGames", finalDecisions);
-    return response;
-}
+
+    public void removePlayerFromAllSchedulersById(Long id) {
+        User user = userRepository.findById(id)
+                .orElseThrow(() -> new IllegalStateException("Nie znaleziono użytkownika o id: " + id));
+
+        List<Scheduler> schedulers = schedulerRepository.findAllByParticipants_Player_Id(user.getId());
+
+        for (Scheduler scheduler : schedulers) {
+            SchedulerParticipant participant = scheduler.getParticipants().stream()
+                    .filter(p -> p.getPlayer().getId().equals(user.getId()))
+                    .findFirst()
+                    .orElse(null);
+
+            if (participant != null) {
+                scheduler.getParticipants().remove(participant);
+                participant.setScheduler(null); // unlink the participant from the scheduler
+            }
+        }
+
+        schedulerRepository.saveAll(schedulers);
+    }
 
     /**
      * A helper class to represent a time point on the timeline with its weight (delta).
diff --git a/src/main/java/dev/goral/rpghandyhelper/user/UserController.java b/src/main/java/dev/goral/rpghandyhelper/user/UserController.java
index 980a6dae..7c76c466 100644
--- a/src/main/java/dev/goral/rpghandyhelper/user/UserController.java
+++ b/src/main/java/dev/goral/rpghandyhelper/user/UserController.java
@@ -21,6 +21,16 @@ public UserDTO getAuthorizedUser() {
         return userService.getAuthorizedUser();
     }
 
+    @GetMapping("/user/find/{regexUsername}")
+    public Map<String, Object> findUsersByRegexUsername(@PathVariable String regexUsername) {
+        return userService.findUsersByRegexUsername(regexUsername);
+    }
+
+    @GetMapping("/user/isPasswordSetForDiscordUser")
+    public Map<String, Object> isPasswordSetForDiscordUser(@AuthenticationPrincipal Object user) {
+        return userService.isPasswordSetForDiscordUser(user);
+    }
+
     @PostMapping("/setPassword")
     public Map<String, Object> setPassword(@RequestBody PasswordRequest passwordRequest) {
         return userService.setPassword(passwordRequest.getPassword());
@@ -47,7 +57,7 @@ public ResponseEntity<byte[]> getUserPhoto(@PathVariable String filename) throws
     }
 
     @GetMapping("/user/photo/username/{username}")
-    public Map<String, Object> getUserPhotoByUsername(@PathVariable String username) throws IOException {
+    public Map<String, Object> getUserPhotoByUsername(@PathVariable String username) {
         return userService.getUserPhotoByUsername(username);
     }
   
@@ -56,6 +66,13 @@ public Map<String, Object> getDefaultUserPhotos() {
         return userService.getDefaultProfilePics();
     }
 
+    // Admin endpoints
+
+    @GetMapping("/admin/user/{id}")
+    public Map<String, Object> getUserById(@PathVariable Long id) {
+        return userService.getAdminUserById(id);
+    }
+
     @GetMapping("/admin/user/all")
     public Map<String, Object> getAllUsers() {
         return userService.getAllUsers();
@@ -66,5 +83,19 @@ public Map<String, Object> createUserAdmin(@RequestBody User user) {
         return userService.createUserAdmin(user);
     }
 
+    @PutMapping("/admin/user/update/{id}")
+    public Map<String, Object> updateUserAdmin(@PathVariable Long id, @RequestBody UserUpdateAdminRequest updateRequest) {
+        return userService.updateUserAdmin(id, updateRequest);
+    }
+
+    @PutMapping("/admin/user/changePassword/{id}")
+    public Map<String, Object> changeUserPasswordAdmin(@PathVariable Long id, @RequestBody PasswordRequest passwordRequest) {
+        return userService.changeUserPasswordAdmin(id, passwordRequest.getPassword());
+    }
+
+    @DeleteMapping("/admin/user/delete/{id}")
+    public Map<String, Object> deleteUserAdmin(@PathVariable Long id) {
+        return userService.deleteUserAdmin(id);
+    }
 
 }
diff --git a/src/main/java/dev/goral/rpghandyhelper/user/UserRepository.java b/src/main/java/dev/goral/rpghandyhelper/user/UserRepository.java
index 1f7dd523..bcfbab21 100644
--- a/src/main/java/dev/goral/rpghandyhelper/user/UserRepository.java
+++ b/src/main/java/dev/goral/rpghandyhelper/user/UserRepository.java
@@ -5,6 +5,7 @@
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Optional;
 
 @Transactional(readOnly = true)
@@ -16,4 +17,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
     @Query("SELECT u FROM User u WHERE u.oAuthId = ?1")
     Optional<User> findByOAuthId(String oAuthId);
 
+    @Query("SELECT u FROM User u WHERE u.username LIKE %?1%")
+    List<User> findByUsernameRegex(String regexUsername);
 }
diff --git a/src/main/java/dev/goral/rpghandyhelper/user/UserService.java b/src/main/java/dev/goral/rpghandyhelper/user/UserService.java
index 9a757ba1..cfd83c32 100644
--- a/src/main/java/dev/goral/rpghandyhelper/user/UserService.java
+++ b/src/main/java/dev/goral/rpghandyhelper/user/UserService.java
@@ -1,5 +1,8 @@
 package dev.goral.rpghandyhelper.user;
 
+import dev.goral.rpghandyhelper.game.GameService;
+import dev.goral.rpghandyhelper.notes.GameNoteService;
+import dev.goral.rpghandyhelper.scheduler.service.SchedulerService;
 import dev.goral.rpghandyhelper.security.CustomReturnables;
 import dev.goral.rpghandyhelper.security.exceptions.ResourceNotFoundException;
 import lombok.AllArgsConstructor;
@@ -35,6 +38,9 @@ public class UserService implements UserDetailsService {
     private final static String USER_NOT_FOUND_MSG = "Nie znaleziono użytkownika o nicku %s";
     private final UserRepository userRepository;
     private final BCryptPasswordEncoder bCryptPasswordEncoder;
+    private final GameNoteService gameNoteService;
+    private final GameService gameUserService;
+    private final SchedulerService schedulerService;
 
     /**
      * Logowanie użytkowników przez Spring Security
@@ -334,6 +340,21 @@ public ResponseEntity<byte[]> getUserPhoto(String filename) throws IOException {
                 .body(image);
     }
 
+    public Map<String, Object> findUsersByRegexUsername(String regexUsername) {
+        Map<String, Object> response = CustomReturnables.getOkResponseMap("Pobrano użytkowników pasujących do wzorca.");
+        if (regexUsername == null || regexUsername.isEmpty()) {
+            response.put("users", Collections.emptyList());
+            return response;
+        }
+        List<User> users = userRepository.findByUsernameRegex(regexUsername);
+        List<UserDTO> userDTOs = new ArrayList<>();
+        for (User user : users) {
+            userDTOs.add(new UserDTO(user.getId(), user.getUsername(), user.getFirstName(), user.getSurname(), user.getEmail(), user.getUserPhotoPath()));
+        }
+        response.put("users", userDTOs);
+          return response;
+    }
+
     public Map<String, Object> getUserPhotoByUsername(String username) {
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new ResourceNotFoundException("Nie znaleziono użytkownika o nicku: " + username));
@@ -347,4 +368,126 @@ public Map<String, Object> getUserPhotoByUsername(String username) {
         response.put("userPhotoPath", userPhotoPath);
         return response;
     }
+
+    public Map<String, Object> updateUserAdmin(Long id, UserUpdateAdminRequest updateRequest) {
+        Map<String, Object> response = CustomReturnables.getOkResponseMap("Użytkownik zaktualizowany.");
+        User user = userRepository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException("Nie znaleziono użytkownika o ID: " + id));
+
+        if (updateRequest.getUsername() != null && !updateRequest.getUsername().isEmpty()) {
+            if (userRepository.findByUsername(updateRequest.getUsername()).isPresent()
+                    && !Objects.equals(user.getUsername(), updateRequest.getUsername())) {
+                throw new IllegalStateException("Użytkownik o podanym nicku już istnieje.");
+            }
+            if (updateRequest.getUsername().length() < 3 || updateRequest.getUsername().length() > 50) {
+                throw new IllegalStateException("Nick musi mieć od 3 do 50 znaków.");
+            }
+            user.setUsername(updateRequest.getUsername());
+            if (updateRequest.getFirstName() != null && !updateRequest.getFirstName().isEmpty()) {
+                if (updateRequest.getFirstName().length() < 3 || updateRequest.getFirstName().length() > 50) {
+                    throw new IllegalStateException("Imię musi mieć od 3 do 50 znaków.");
+                }
+                user.setFirstName(updateRequest.getFirstName());
+            }
+            if (updateRequest.getSurname() != null && !updateRequest.getSurname().isEmpty()) {
+                if (updateRequest.getSurname().length() < 3 || updateRequest.getSurname().length() > 50) {
+                    throw new IllegalStateException("Nazwisko musi mieć od 3 do 50 znaków.");
+                }
+                user.setSurname(updateRequest.getSurname());
+            }
+            if (updateRequest.getEmail() != null && !updateRequest.getEmail().isEmpty()) {
+                if (userRepository.findByEmail(updateRequest.getEmail()).isPresent()
+                        && !Objects.equals(user.getEmail(), updateRequest.getEmail())) {
+                    throw new IllegalStateException("Użytkownik o podanym emailu już istnieje.");
+                }
+                user.setEmail(updateRequest.getEmail());
+            }
+            if (updateRequest.getRole() != null) {
+                user.setRole(updateRequest.getRole());
+            }
+            if (updateRequest.getLocked() != null) {
+                user.setLocked(updateRequest.getLocked());
+            }
+            if (updateRequest.getEnabled() != null) {
+                user.setEnabled(updateRequest.getEnabled());
+            }
+            if (updateRequest.getUserPhotoPath() != null && !updateRequest.getUserPhotoPath().isEmpty()) {
+                user.setUserPhotoPath(updateRequest.getUserPhotoPath());
+            }
+            userRepository.save(user);
+        }
+        return response;
+    }
+
+    public Map<String, Object> getAdminUserById(Long id) {
+        User user = userRepository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException("Nie znaleziono użytkownika o ID: " + id));
+
+        Map<String, Object> response = CustomReturnables.getOkResponseMap("Pobrano użytkownika.");
+        response.put("user", user);
+        return response;
+    }
+
+    @Transactional
+    public Map<String, Object> deleteUserAdmin(Long id) {
+        User user = userRepository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException("Nie znaleziono użytkownika o ID: " + id));
+
+        // Usuń notatki powiązane z użytkownikiem
+        gameNoteService.deleteAllByUserId(id);
+
+        // Usuń zdjęcie profilowe, jeśli nie jest domyślne
+        String userPhotoPath = user.getUserPhotoPath();
+        if (userPhotoPath != null && !userPhotoPath.startsWith("/img/profilePics/defaultProfilePic")) {
+            Path baseDir = Paths.get("src/main/resources/static/img/profilePics").normalize().toAbsolutePath();
+            Path photoFile = baseDir.resolve(Paths.get(userPhotoPath).getFileName()).normalize().toAbsolutePath();
+            try {
+                Files.deleteIfExists(photoFile);
+            } catch (IOException e) {
+                throw new IllegalStateException("Błąd przy usuwaniu zdjęcia profilowego użytkownika.");
+            }
+        }
+
+        // Usuń uczestnictwo w schedulerach
+        schedulerService.removePlayerFromAllSchedulersById(id);
+
+        // Usuń powiązania z grami
+        gameUserService.deleteUserFromAllGames(id);
+
+        // Usuń użytkownika
+        userRepository.delete(user);
+
+        return CustomReturnables.getOkResponseMap("Użytkownik został usunięty.");
+    }
+
+    public Map<String, Object> changeUserPasswordAdmin(Long id, String password) {
+
+        User user = userRepository.findById(id)
+                .orElseThrow(() -> new ResourceNotFoundException("Nie znaleziono użytkownika o ID: " + id));
+
+        if (!validatePassword(password)) {
+            throw new IllegalStateException("Hasło musi zawierać co najmniej 8 znaków, jedną cyfrę, jedną małą literę, jedną dużą literę oraz jeden znak specjalny.");
+        }
+
+        user.setPassword(bCryptPasswordEncoder.encode(password));
+        userRepository.save(user);
+
+        return CustomReturnables.getOkResponseMap("Twoje hasło zostało zmienione.");
+    }
+    public Map<String, Object> isPasswordSetForDiscordUser(Object user) {
+
+        if (user instanceof User) {
+            return CustomReturnables.getOkResponseMap("Użytkownik nie jest zalogowany przez OAuth2.");
+        } else if (user instanceof DefaultOAuth2User oauthUser) {
+            String email = oauthUser.getAttribute("email");
+            User userEntity = userRepository.findByEmail(email)
+                    .orElseThrow(() -> new ResourceNotFoundException("Nie znaleziono użytkownika powiązanego z tym kontem Discord"));
+            boolean isPasswordSet = userEntity.getPassword() != null && !userEntity.getPassword().isEmpty();
+            Map<String, Object> response = CustomReturnables.getOkResponseMap("Sprawdzono, czy hasło jest ustawione dla użytkownika.");
+            response.put("isPasswordSet", isPasswordSet);
+            return response;
+        } else {
+            throw new IllegalStateException("Nie udało się pobrać zalogowanego użytkownika.");
+        }
+    }
 }
diff --git a/src/main/java/dev/goral/rpghandyhelper/user/UserUpdateAdminRequest.java b/src/main/java/dev/goral/rpghandyhelper/user/UserUpdateAdminRequest.java
new file mode 100644
index 00000000..31634382
--- /dev/null
+++ b/src/main/java/dev/goral/rpghandyhelper/user/UserUpdateAdminRequest.java
@@ -0,0 +1,17 @@
+package dev.goral.rpghandyhelper.user;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UserUpdateAdminRequest {
+    String username;
+    String firstName;
+    String surname;
+    String email;
+    UserRole role;
+    Boolean locked;
+    Boolean enabled;
+    String userPhotoPath;
+}
diff --git a/src/main/resources/static/img/assets/expand-icon-dark-version.svg b/src/main/resources/static/img/assets/expand-icon-dark-version.svg
new file mode 100644
index 00000000..f5760a3a
--- /dev/null
+++ b/src/main/resources/static/img/assets/expand-icon-dark-version.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="500" zoomAndPan="magnify" viewBox="0 0 375 374.999991" height="500" preserveAspectRatio="xMidYMid meet" version="1.2"><defs><clipPath id="4f2abd5ef1"><path d="M 56 52.636719 L 194 52.636719 L 194 302.386719 L 56 302.386719 Z M 56 52.636719 "/></clipPath><clipPath id="9cee17044b"><path d="M 181 52.636719 L 319 52.636719 L 319 302.386719 L 181 302.386719 Z M 181 52.636719 "/></clipPath></defs><g id="4738d7c6ad"><g clip-rule="nonzero" clip-path="url(#4f2abd5ef1)"><path style=" stroke:none;fill-rule:evenodd;fill:#e1e1e1;fill-opacity:1;" d="M 61.019531 298.734375 C 66.074219 303.601562 74.261719 303.601562 79.304688 298.734375 L 186.234375 195.542969 C 196.332031 185.796875 196.332031 169.988281 186.234375 160.242188 L 78.53125 56.289062 C 73.523438 51.472656 65.4375 51.410156 60.375 56.164062 C 55.191406 61.019531 55.132812 69.015625 60.230469 73.945312 L 158.808594 169.0625 C 163.863281 173.941406 163.863281 181.84375 158.808594 186.722656 L 61.019531 281.089844 C 55.964844 285.957031 55.964844 293.867188 61.019531 298.734375 "/></g><g clip-rule="nonzero" clip-path="url(#9cee17044b)"><path style=" stroke:none;fill-rule:evenodd;fill:#e1e1e1;fill-opacity:1;" d="M 186.011719 298.734375 C 191.066406 303.601562 199.257812 303.601562 204.300781 298.734375 L 311.230469 195.542969 C 321.328125 185.796875 321.328125 169.988281 311.230469 160.242188 L 203.527344 56.289062 C 198.519531 51.472656 190.433594 51.410156 185.367188 56.164062 C 180.183594 61.019531 180.128906 69.015625 185.226562 73.945312 L 283.804688 169.0625 C 288.859375 173.941406 288.859375 181.84375 283.804688 186.722656 L 186.011719 281.089844 C 180.957031 285.957031 180.957031 293.867188 186.011719 298.734375 "/></g></g></svg>
\ No newline at end of file
diff --git a/src/main/resources/static/img/assets/expand-icon-light-version.svg b/src/main/resources/static/img/assets/expand-icon-light-version.svg
new file mode 100644
index 00000000..7c8e1fa8
--- /dev/null
+++ b/src/main/resources/static/img/assets/expand-icon-light-version.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="500" zoomAndPan="magnify" viewBox="0 0 375 374.999991" height="500" preserveAspectRatio="xMidYMid meet" version="1.2"><defs><clipPath id="8ce4e3435b"><path d="M 56 52.636719 L 194 52.636719 L 194 302.386719 L 56 302.386719 Z M 56 52.636719 "/></clipPath><clipPath id="b3b89f3c0c"><path d="M 181 52.636719 L 319 52.636719 L 319 302.386719 L 181 302.386719 Z M 181 52.636719 "/></clipPath></defs><g id="59f16ee4c6"><g clip-rule="nonzero" clip-path="url(#8ce4e3435b)"><path style=" stroke:none;fill-rule:evenodd;fill:#252525;fill-opacity:1;" d="M 61.019531 298.734375 C 66.074219 303.601562 74.261719 303.601562 79.304688 298.734375 L 186.234375 195.542969 C 196.332031 185.796875 196.332031 169.988281 186.234375 160.242188 L 78.53125 56.289062 C 73.523438 51.472656 65.4375 51.410156 60.375 56.164062 C 55.191406 61.019531 55.132812 69.015625 60.230469 73.945312 L 158.808594 169.0625 C 163.863281 173.941406 163.863281 181.84375 158.808594 186.722656 L 61.019531 281.089844 C 55.964844 285.957031 55.964844 293.867188 61.019531 298.734375 "/></g><g clip-rule="nonzero" clip-path="url(#b3b89f3c0c)"><path style=" stroke:none;fill-rule:evenodd;fill:#252525;fill-opacity:1;" d="M 186.011719 298.734375 C 191.066406 303.601562 199.257812 303.601562 204.300781 298.734375 L 311.230469 195.542969 C 321.328125 185.796875 321.328125 169.988281 311.230469 160.242188 L 203.527344 56.289062 C 198.519531 51.472656 190.433594 51.410156 185.367188 56.164062 C 180.183594 61.019531 180.128906 69.015625 185.226562 73.945312 L 283.804688 169.0625 C 288.859375 173.941406 288.859375 181.84375 283.804688 186.722656 L 186.011719 281.089844 C 180.957031 285.957031 180.957031 293.867188 186.011719 298.734375 "/></g></g></svg>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/admin.html b/src/main/resources/templates/admin/admin.html
new file mode 100644
index 00000000..0ebac8e9
--- /dev/null
+++ b/src/main/resources/templates/admin/admin.html
@@ -0,0 +1,217 @@
+<!DOCTYPE html>
+<html lang="pl">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Panel Admina | RPG Handy Helper</title>
+    <link id="favicon" rel="icon" type="image/svg+xml" href="/img/logo/logo-light.svg">
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=League+Spartan:wght@100..900&display=swap');
+
+        .font-league-spartan {
+            font-family: 'League Spartan', sans-serif;
+        }
+
+        .font-jetbrains-mono {
+            font-family: 'JetBrains Mono', monospace;
+        }
+    </style>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script> <!-- Dodanie SweetAlert2 -->
+    <script src="https://kit.fontawesome.com/0a5e3ca64c.js" crossorigin="anonymous"></script>
+    <!-- Dodanie Font Awesome -->
+    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script> <!-- Dodanie Tailwind CSS -->
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script> <!-- Dodanie Marked.js -->
+    <script>
+        // ===== Ustawienia Tailwind CSS =====
+        tailwind.config = {
+            darkMode: "class",
+            theme: {
+                extend: {
+                    colors: {
+                        dark: {
+                            background: "#1E1E1E",
+                            backgroundSecondary: "#181818",
+                            backgroundTertiary: "#101010",
+                            textPrimary: "#E1E1E1",
+                            textSecondary: "#AFAFAF",
+                            accent: "#12e1b9",
+                            border: "#333333",
+                            surface: "#1E1E1E",
+                            accentDark: "#00B189",
+                            success: "#00EE00",
+                            error: "#D00000",
+                            warning: "#FF9831",
+                        },
+                        light: {
+                            background: "#E1E1E1",
+                            backgroundSecondary: "#C1C1C1",
+                            backgroundTertiary: "#818181",
+                            textPrimary: "#252525",
+                            surface: "#F5F5F5",
+                            border: "#CCCCCC",
+                            textSecondary: "#505050",
+                            accent: "#ED1E46",
+                            accentDark: "#BD0016",
+                            success: "#009688",
+                            error: "#b388FF",
+                            warning: "#FF6F00",
+                        },
+                    },
+                },
+            },
+        };
+        document.addEventListener("DOMContentLoaded", () => {
+            initThemeToggle();
+            applyTheme(getSavedTheme());
+        });
+        function initThemeToggle() {
+            const wrapper = document.getElementById("theme-toggle-wrapper");
+            const toggle = document.getElementById("switch-component");
+            if (!toggle) return;
+
+            const updateTheme = () => {
+                const theme = toggle.checked ? "dark" : "light";
+                applyTheme(theme);
+            };
+
+            toggle.addEventListener("change", updateTheme);
+            wrapper?.addEventListener("click", () => {
+                toggle.checked = !toggle.checked;
+                updateTheme();
+            });
+        }
+
+        function applyTheme(theme) {
+            document.body.classList.toggle("dark", theme === "dark");
+            localStorage.setItem("theme", theme);
+            updateFavicon(theme);
+
+            const toggle = document.getElementById("switch-component");
+            if (toggle) {
+                toggle.checked = (theme === "dark");
+            }
+        }
+
+        function updateFavicon(theme) {
+            const favicon = document.getElementById("favicon");
+            if (favicon) {
+                favicon.href = `/img/logo/logo-${theme}.svg`;
+            }
+        }
+
+        function getSavedTheme() {
+            return localStorage.getItem("theme") ||
+                (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light");
+        }
+    </script>
+</head>
+
+<body>
+    <nav
+        class="flex justify-around w-full p-6 bg-light-surface dark:bg-dark-surface border-b border-light-border dark:border-dark-border">
+        <a href="/home">
+            <div class="flex items-center">
+                <img id="logo-light" src="/img/logo/logo-light.svg" alt="RPG Manager" class="h-10 w-10 dark:hidden">
+                <img id="logo-dark" src="/img/logo/logo-dark.svg" alt="RPG Manager" class="h-10 w-10 hidden dark:block">
+                <h1
+                    class="text-xl font-semibold ml-3 text-light-textPrimary dark:text-dark-textPrimary font-jetbrains-mono">
+                    RPG Handy Helper
+                </h1>
+            </div>
+        </a>
+        <div id="theme-toggle-wrapper" class="flex items-center justify-center">
+            <i class="fa-solid fa-sun p-2 text-light-accent dark:text-dark-accent"></i>
+            <div class="relative inline-block w-12 h-6">
+                <input id="switch-component" type="checkbox" class="peer hidden m-1" />
+                <label for="switch-component" class="absolute top-0.5 left-0.5 w-5 h-5 rounded-full
+                       bg-light-accent dark:bg-dark-accent
+                       shadow-md transition-all duration-300 
+                       peer-checked:translate-x-[0.75rem] 
+                       peer-checked:dark:bg-dark-accent peer-checked:bg-light-accent
+                       cursor-pointer hover:shadow-lg">
+                </label>
+                <div class="w-12 h-6 rounded-full transition-all duration-300 cursor-pointer
+                        bg-light-backgroundSecondary dark:bg-dark-backgroundTertiary">
+                </div>
+            </div>
+            <i class="fa-solid fa-moon p-2 text-light-accent dark:text-dark-accent"></i>
+        </div>
+    </nav>
+    <main
+        class="min-h-[86.75vh] flex-grow flex flex-row items-center justify-center bg-light-background dark:bg-dark-background w-full">
+        <div class="flex flex-col items-center justify-center w-full h-full">
+            <header class="font-bold text-light-textPrimary dark:text-dark-textPrimary mb-8 flex flex-col items-center justify-center text-center gap-4">
+                <h1 class="text-5xl md:text-6xl tracking-widest leading-tight">Panel Administratora </h1>
+                <h1 id="helloAdmin" class="text-5xl md:text-6xl tracking-widest leading-tight"></h1>
+                <div class="text-3xl font-medium pt-4">
+                    Opcje administracyjne:
+                </div>
+            </header>
+            <div class="flex flex-col space-y-4 w-full max-w-md">
+                <div class="flex flex-col md:flex-row md:space-x-6 space-y-6 md:space-y-0">
+                    <button
+                        class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                        onclick="location.href='/admin/users'">Użytkownicy</button>
+                    <button
+                        class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                        onclick="location.href='/admin/user/myPassword'">Moje Hasło</button>
+                </div>
+                <div class="flex flex-col md:flex-row md:space-x-6 space-y-6 md:space-y-0">
+                    <button
+                        class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                        onclick="location.href='/home'">Strona Domowa</button>
+                    <button
+                        class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                        onclick="location.href='/logout'">
+                        Wyloguj się</button>
+                </div>
+            </div>
+        </div>
+    </main>
+    <footer
+        class="w-full text-center p-4 bg-light-surface dark:bg-dark-surface font-jetbrains-mono text-light-text dark:text-dark-text border-t border-light-border dark:border-dark-border">
+        <h3 class="text-light-textPrimary dark:text-dark-textPrimary">Od Graczy dla Graczy © 2025 RPG Handy Helper</h3>
+        <a href="https://github.com/xEdziu/RPG-Handy-Helper" target="_blank"
+            class="text-light-accent dark:text-dark-accent">
+            <i class="fa-brands fa-github"></i>
+        </a>
+    </footer>
+</body>
+<script defer src="/scripts/footer.js"></script>
+</html>
+<script>
+    function getCsrfToken() {
+        const cookies = document.cookie.split(';');
+        for (let cookie of cookies) {
+            cookie = cookie.trim();
+            if (cookie.startsWith('XSRF-TOKEN=')) {
+                return cookie.substring('XSRF-TOKEN='.length);
+            }
+        }
+        return null;
+    }
+
+    document.addEventListener('DOMContentLoaded', () => {
+        fetch('/api/v1/authorized/user', {
+            method: 'GET',
+            headers: {
+                'X-XSRF-TOKEN': getCsrfToken()
+            }
+        }).then(res => res.json())
+            .then(data => {
+                const userSection = document.getElementById('helloAdmin');
+                userSection.textContent = `Witaj, ${data.username}!`;
+            }).catch(err => {
+                console.error('Błąd podczas pobierania danych użytkownika:', err);
+            });
+    });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/changePasswordAdmin.html b/src/main/resources/templates/admin/changePasswordAdmin.html
new file mode 100644
index 00000000..a7bfc93c
--- /dev/null
+++ b/src/main/resources/templates/admin/changePasswordAdmin.html
@@ -0,0 +1,297 @@
+<!DOCTYPE html>
+<html lang="pl">
+
+<head>
+  <meta charset="UTF-8">
+  <title>Zmiana hasła</title>
+  <link id="favicon" rel="icon" type="image/svg+xml" href="/img/logo/logo-light.svg">
+  <style>
+    @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=League+Spartan:wght@100..900&display=swap');
+
+    .font-league-spartan {
+      font-family: 'League Spartan', sans-serif;
+    }
+
+    .font-jetbrains-mono {
+      font-family: 'JetBrains Mono', monospace;
+    }
+  </style>
+  <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script> <!-- Dodanie SweetAlert2 -->
+  <script src="https://kit.fontawesome.com/0a5e3ca64c.js" crossorigin="anonymous"></script><!-- Dodanie Font Awesome -->
+  <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script> <!-- Dodanie Tailwind CSS -->
+  <script src="https://cdn.tailwindcss.com"></script>
+  <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script> <!-- Dodanie Marked.js -->
+  <script>
+    // ===== Ustawienia Tailwind CSS =====
+    tailwind.config = {
+      darkMode: "class",
+      theme: {
+        extend: {
+          colors: {
+            dark: {
+              background: "#1E1E1E",
+              backgroundSecondary: "#181818",
+              backgroundTertiary: "#101010",
+              textPrimary: "#E1E1E1",
+              textSecondary: "#AFAFAF",
+              accent: "#12e1b9",
+              border: "#333333",
+              surface: "#1E1E1E",
+              accentDark: "#00B189",
+              success: "#00EE00",
+              error: "#D00000",
+              warning: "#FF9831",
+            },
+            light: {
+              background: "#E1E1E1",
+              backgroundSecondary: "#C1C1C1",
+              backgroundTertiary: "#818181",
+              textPrimary: "#252525",
+              surface: "#F5F5F5",
+              border: "#CCCCCC",
+              textSecondary: "#505050",
+              accent: "#ED1E46",
+              accentDark: "#BD0016",
+              success: "#009688",
+              error: "#b388FF",
+              warning: "#FF6F00",
+            },
+          },
+        },
+      },
+    };
+    document.addEventListener("DOMContentLoaded", () => {
+      initThemeToggle();
+      applyTheme(getSavedTheme());
+    });
+    function initThemeToggle() {
+      const wrapper = document.getElementById("theme-toggle-wrapper");
+      const toggle = document.getElementById("switch-component");
+      if (!toggle) return;
+
+      const updateTheme = () => {
+        const theme = toggle.checked ? "dark" : "light";
+        applyTheme(theme);
+      };
+
+      toggle.addEventListener("change", updateTheme);
+      wrapper?.addEventListener("click", () => {
+        toggle.checked = !toggle.checked;
+        updateTheme();
+      });
+    }
+
+    function applyTheme(theme) {
+      document.body.classList.toggle("dark", theme === "dark");
+      localStorage.setItem("theme", theme);
+      updateFavicon(theme);
+
+      const toggle = document.getElementById("switch-component");
+      if (toggle) {
+        toggle.checked = (theme === "dark");
+      }
+    }
+
+    function updateFavicon(theme) {
+      const favicon = document.getElementById("favicon");
+      if (favicon) {
+        favicon.href = `/img/logo/logo-${theme}.svg`;
+      }
+    }
+
+    function getSavedTheme() {
+      return localStorage.getItem("theme") ||
+        (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light");
+    }
+  </script>
+</head>
+
+<body>
+  <nav
+    class="flex justify-around w-full p-6 bg-light-surface dark:bg-dark-surface border-b border-light-border dark:border-dark-border">
+    <a href="/home">
+      <div class="flex items-center">
+        <img id="logo-light" src="/img/logo/logo-light.svg" alt="RPG Manager" class="h-10 w-10 dark:hidden">
+        <img id="logo-dark" src="/img/logo/logo-dark.svg" alt="RPG Manager" class="h-10 w-10 hidden dark:block">
+        <h1 class="text-xl font-semibold ml-3 text-light-textPrimary dark:text-dark-textPrimary font-jetbrains-mono">
+          RPG Handy Helper
+        </h1>
+      </div>
+    </a>
+    <div id="theme-toggle-wrapper" class="flex items-center justify-center">
+      <i class="fa-solid fa-sun p-2 text-light-accent dark:text-dark-accent"></i>
+      <div class="relative inline-block w-12 h-6">
+        <input id="switch-component" type="checkbox" class="peer hidden m-1" />
+        <label for="switch-component"
+          class="absolute top-0.5 left-0.5 w-5 h-5 rounded-full bg-light-accent dark:bg-dark-accent shadow-md transition-all duration-300 peer-checked:translate-x-[0.75rem] peer-checked:dark:bg-dark-accent peer-checked:bg-light-accent cursor-pointer hover:shadow-lg">
+        </label>
+        <div
+          class="w-12 h-6 rounded-full transition-all duration-300 cursor-pointer bg-light-backgroundSecondary dark:bg-dark-backgroundTertiary">
+        </div>
+      </div>
+      <i class="fa-solid fa-moon p-2 text-light-accent dark:text-dark-accent"></i>
+    </div>
+  </nav>
+  <main
+    class="min-h-[86.75vh] flex-grow flex flex-col items-center justify-center bg-light-background dark:bg-dark-background w-full gap-6">
+    <aside
+      class="w-[80%] text-light-textPrimary dark:text-dark-textPrimary mb-6 flex flex-row justify-center items-center mb-[3rem] gap-6">
+      <button
+        class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+        onclick="location.href='/admin'">Powrót </button>
+      <button
+        class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+        onclick="location.href='/admin/users'">Użytkownicy </button>
+      <button
+        class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+        onclick="location.href='/home'">Strona Domowa</button>
+      <button
+        class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+        onclick="location.href='/logout'">
+        Wyloguj się</button>
+    </aside>
+    <header
+      class="font-bold text-light-textPrimary dark:text-dark-textPrimary mb-8 flex flex-col items-center justify-center text-center gap-4">
+      <h1 class="text-5xl md:text-6xl tracking-widest leading-tight">Zmień swoje hasło: </h1>
+    </header>
+    <form class="flex flex-col items-center justify-center w-full max-w-md">
+      <!-- <label for="newPassword">Nowe hasło:</label>
+        <input type="password" id="newPassword" name="newPassword" required><br><br> -->
+      <div class="relative m-5 w-full">
+        <input type="password" id="newPassword" aria-describedby="password" name="newPassword" required
+          autocomplete="off"
+          class="block rounded-t-lg px-2.5 pb-2.5 pt-5 w-full text-sm text-light-textPrimary dark:text-dark-textPrimary  bg-light-background dark:bg-dark-surface border-0 border-b-2 border-light-border dark:border-dark-border focus:outline-none focus:ring-0 focus:border-light-accent peer dark:focus:border-dark-accent  placeholder-light-textSecondary dark:placeholder-dark-textSecondary"
+          placeholder=" " />
+        <label for="newPassword"
+          class="absolute text-lg text-light-textSecondary dark:text-dark-textSecondary  duration-300 transform -translate-y-4 scale-90 top-4 z-10 origin-[0] start-2.5  peer-focus:text-light-accent peer-focus:dark:text-dark-accent peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0  peer-focus:scale-90 peer-focus:-translate-y-4  rtl:peer-focus:translate-x-1/4 rtl:peer-focus:left-auto">
+          <i class="fa-solid fa-user-lock mr-1"></i>Nowe hasło:
+        </label>
+        <i id="togglePasswordIcon1" onclick="togglePassword('newPassword', 'togglePasswordIcon1')"
+          class="appearance-auto fa-solid fa-eye absolute right-4 top-4.5 text-light-textSecondary dark:text-dark-textSecondary cursor-pointer">
+        </i>
+      </div>
+      <!-- <label for="confirmNewPassword">Potwierdź nowe hasło:</label>
+        <input type="password" id="confirmNewPassword" name="confirmNewPassword" required><br><br> -->
+      <div class="relative m-5 w-full">
+        <input type="password" id="confirmNewPassword" aria-describedby="password" name="confirmNewPassword" required
+          autocomplete="off"
+          class="block rounded-t-lg px-2.5 pb-2.5 pt-5 w-full text-sm text-light-textPrimary dark:text-dark-textPrimary  bg-light-background dark:bg-dark-surface border-0 border-b-2 border-light-border dark:border-dark-border focus:outline-none focus:ring-0 focus:border-light-accent peer dark:focus:border-dark-accent  placeholder-light-textSecondary dark:placeholder-dark-textSecondary"
+          placeholder=" " />
+        <label for="confirmNewPassword"
+          class="absolute text-lg text-light-textSecondary dark:text-dark-textSecondary  duration-300 transform -translate-y-4 scale-90 top-4 z-10 origin-[0] start-2.5  peer-focus:text-light-accent peer-focus:dark:text-dark-accent peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0  peer-focus:scale-90 peer-focus:-translate-y-4  rtl:peer-focus:translate-x-1/4 rtl:peer-focus:left-auto">
+          <i class="fa-solid fa-user-lock mr-1"></i>Potwierdź nowe hasło:
+        </label>
+        <i id="togglePasswordIcon2" onclick="togglePassword('confirmNewPassword', 'togglePasswordIcon2')"
+          class="appearance-auto fa-solid fa-eye absolute right-4 top-4.5 text-light-textSecondary dark:text-dark-textSecondary cursor-pointer">
+        </i>
+      </div>
+      <!-- <button type="submit">Zmień hasło</button> -->
+      <button
+        class="mt-3 w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2 border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+        type="submit">Zmień hasło</button>
+    </form>
+  </main>
+  <footer
+    class="w-full text-center p-4 bg-light-surface dark:bg-dark-surface font-jetbrains-mono text-light-text dark:text-dark-text border-t border-light-border dark:border-dark-border">
+    <h3 class="text-light-textPrimary dark:text-dark-textPrimary">Od Graczy dla Graczy © 2025 RPG Handy Helper</h3>
+    <a href="https://github.com/xEdziu/RPG-Handy-Helper" target="_blank"
+      class="text-light-accent dark:text-dark-accent">
+      <i class="fa-brands fa-github"></i>
+    </a>
+  </footer>
+  <script defer src="/scripts/footer.js"></script>
+</body>
+<script>
+  function togglePassword(inputId, iconId) { // Funkcja do przełączania widoczności hasła
+    const inputField = document.getElementById(inputId);
+    const icon = document.getElementById(iconId);
+    const isPassword = inputField.type === "password";
+    inputField.type = isPassword ? "text" : "password";
+    icon.classList.replace(isPassword ? "fa-eye" : "fa-eye-slash", isPassword ? "fa-eye-slash" : "fa-eye");
+  }
+  function getCsrfToken() {
+    const cookies = document.cookie.split(';');
+    for (let cookie of cookies) {
+      cookie = cookie.trim();
+      if (cookie.startsWith('XSRF-TOKEN=')) {
+        return cookie.substring('XSRF-TOKEN='.length);
+      }
+    }
+    return null;
+  }
+
+  let userId = null;
+
+  document.addEventListener("DOMContentLoaded", function () {
+    fetch('http://localhost:8888/api/v1/authorized/user', {
+      method: 'GET',
+      headers: {
+        'X-XSRF-TOKEN': getCsrfToken()
+      }
+    }).then(res => res.json())
+      .then(data => {
+        userId = data.id;
+      }).catch(err => {
+        console.error('Błąd podczas pobierania danych użytkownika:', err);
+      });
+  });
+
+  const form = document.querySelector("form");
+  form.addEventListener("submit", function (event) {
+    event.preventDefault();
+    const newPassword = document.getElementById("newPassword").value;
+    const confirmNewPassword = document.getElementById("confirmNewPassword").value;
+
+    if (newPassword !== confirmNewPassword) {
+      event.preventDefault();
+      Swal.fire({
+        icon: 'error',
+        title: 'Błąd',
+        text: "Nowe hasła nie są zgodne. Proszę spróbować ponownie."
+      });
+    }
+
+    fetch(`/api/v1/authorized/admin/user/changePassword/${userId}`, {
+      method: "PUT",
+      headers: {
+        "Content-Type": "application/json",
+        "X-XSRF-TOKEN": getCsrfToken()
+      },
+      body: JSON.stringify({ password: newPassword })
+    }).then(res => res.json())
+      .then(data => {
+        console.log('Odpowiedź serwera:', data);
+        if (data.error === 200) {
+          Swal.fire({
+            icon: 'success',
+            title: 'Sukces',
+            text: 'Hasło zostało zmienione pomyślnie.'
+          });
+          window.location.href = "/admin/users";
+        } else {
+          Swal.fire({
+            icon: 'error',
+            title: 'Błąd',
+            text: 'Hasło musi zawierać co najmniej 8 znaków, jedną cyfrę, jedną małą literę, jedną dużą literę oraz jeden znak specjalny'
+          });
+        }
+      }).catch(err => {
+        console.error('Błąd podczas zmiany hasła:', err);
+        Swal.fire({
+          icon: 'error',
+          title: 'Błąd',
+          text: "Wystąpił błąd podczas zmiany hasła. Proszę spróbować ponownie."
+        });
+      });
+  })
+</script>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/userEdit.html b/src/main/resources/templates/admin/userEdit.html
new file mode 100644
index 00000000..f6a73a41
--- /dev/null
+++ b/src/main/resources/templates/admin/userEdit.html
@@ -0,0 +1,352 @@
+<!DOCTYPE html>
+<html lang="pl">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Edycja Użytkownika</title>
+    <link id="favicon" rel="icon" type="image/svg+xml" href="/img/logo/logo-light.svg">
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=League+Spartan:wght@100..900&display=swap');
+
+        .font-league-spartan {
+            font-family: 'League Spartan', sans-serif;
+        }
+
+        .font-jetbrains-mono {
+            font-family: 'JetBrains Mono', monospace;
+        }
+    </style>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script> <!-- Dodanie SweetAlert2 -->
+    <script src="https://kit.fontawesome.com/0a5e3ca64c.js" crossorigin="anonymous"></script>
+    <!-- Dodanie Font Awesome -->
+    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script> <!-- Dodanie Tailwind CSS -->
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script> <!-- Dodanie Marked.js -->
+    <script>
+        // ===== Ustawienia Tailwind CSS =====
+        tailwind.config = {
+            darkMode: "class",
+            theme: {
+                extend: {
+                    colors: {
+                        dark: {
+                            background: "#1E1E1E",
+                            backgroundSecondary: "#181818",
+                            backgroundTertiary: "#101010",
+                            textPrimary: "#E1E1E1",
+                            textSecondary: "#AFAFAF",
+                            accent: "#12e1b9",
+                            border: "#333333",
+                            surface: "#1E1E1E",
+                            accentDark: "#00B189",
+                            success: "#00EE00",
+                            error: "#D00000",
+                            warning: "#FF9831",
+                        },
+                        light: {
+                            background: "#E1E1E1",
+                            backgroundSecondary: "#C1C1C1",
+                            backgroundTertiary: "#818181",
+                            textPrimary: "#252525",
+                            surface: "#F5F5F5",
+                            border: "#CCCCCC",
+                            textSecondary: "#505050",
+                            accent: "#ED1E46",
+                            accentDark: "#BD0016",
+                            success: "#009688",
+                            error: "#b388FF",
+                            warning: "#FF6F00",
+                        },
+                    },
+                },
+            },
+        };
+        document.addEventListener("DOMContentLoaded", () => {
+            initThemeToggle();
+            applyTheme(getSavedTheme());
+        });
+        function initThemeToggle() {
+            const wrapper = document.getElementById("theme-toggle-wrapper");
+            const toggle = document.getElementById("switch-component");
+            if (!toggle) return;
+
+            const updateTheme = () => {
+                const theme = toggle.checked ? "dark" : "light";
+                applyTheme(theme);
+            };
+
+            toggle.addEventListener("change", updateTheme);
+            wrapper?.addEventListener("click", () => {
+                toggle.checked = !toggle.checked;
+                updateTheme();
+            });
+        }
+
+        function applyTheme(theme) {
+            document.body.classList.toggle("dark", theme === "dark");
+            localStorage.setItem("theme", theme);
+            updateFavicon(theme);
+
+            const toggle = document.getElementById("switch-component");
+            if (toggle) {
+                toggle.checked = (theme === "dark");
+            }
+        }
+
+        function updateFavicon(theme) {
+            const favicon = document.getElementById("favicon");
+            if (favicon) {
+                favicon.href = `/img/logo/logo-${theme}.svg`;
+            }
+        }
+
+        function getSavedTheme() {
+            return localStorage.getItem("theme") ||
+                (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light");
+        }
+    </script>
+</head>
+
+<body>
+    <nav
+        class="flex justify-around w-full p-6 bg-light-surface dark:bg-dark-surface border-b border-light-border dark:border-dark-border">
+        <a href="/home">
+            <div class="flex items-center">
+                <img id="logo-light" src="/img/logo/logo-light.svg" alt="RPG Manager" class="h-10 w-10 dark:hidden">
+                <img id="logo-dark" src="/img/logo/logo-dark.svg" alt="RPG Manager" class="h-10 w-10 hidden dark:block">
+                <h1
+                    class="text-xl font-semibold ml-3 text-light-textPrimary dark:text-dark-textPrimary font-jetbrains-mono">
+                    RPG Handy Helper
+                </h1>
+            </div>
+        </a>
+        <div id="theme-toggle-wrapper" class="flex items-center justify-center">
+            <i class="fa-solid fa-sun p-2 text-light-accent dark:text-dark-accent"></i>
+            <div class="relative inline-block w-12 h-6">
+                <input id="switch-component" type="checkbox" class="peer hidden m-1" />
+                <label for="switch-component" class="absolute top-0.5 left-0.5 w-5 h-5 rounded-full
+                       bg-light-accent dark:bg-dark-accent
+                       shadow-md transition-all duration-300 
+                       peer-checked:translate-x-[0.75rem] 
+                       peer-checked:dark:bg-dark-accent peer-checked:bg-light-accent
+                       cursor-pointer hover:shadow-lg">
+                </label>
+                <div class="w-12 h-6 rounded-full transition-all duration-300 cursor-pointer
+                        bg-light-backgroundSecondary dark:bg-dark-backgroundTertiary">
+                </div>
+            </div>
+            <i class="fa-solid fa-moon p-2 text-light-accent dark:text-dark-accent"></i>
+        </div>
+    </nav>
+    <main
+        class="min-h-[86.75vh] flex-grow flex flex-col items-center justify-center bg-light-background dark:bg-dark-background w-full">
+        <aside class="w-[80%] text-light-textPrimary dark:text-dark-textPrimary flex flex-row justify-center items-center my-[2rem] gap-6">
+            <button
+                class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                onclick="location.href='/admin/users'">Powrót </button>
+            <button
+                class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                onclick="location.href='/admin/user/myPassword'">Moje Hasło</button>
+            <button
+                class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                onclick="location.href='/home'">Strona Domowa</button>
+            <button
+                class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                onclick="location.href='/logout'">
+                Wyloguj się</button>
+        </aside>
+        <h2 id="username-form"
+            class="text-2xl font-jetbrains-mono text-light-textPrimary dark:text-dark-textPrimary font-bold"></h2>
+        <form class="w-[90%] md:w-[40%] flex flex-col items-center">
+            <!-- <div>
+                <label for="username">Nazwa użytkownika:</label>
+                <input type="text" id="username" name="username" required>
+            </div> -->
+            <div class="relative m-5 w-full">
+                <input type="text" id="username" aria-describedby="username" name="username" required autocomplete="off"
+                    class="block rounded-t-lg px-2.5 pb-2.5 pt-5 w-full text-sm text-light-textPrimary dark:text-dark-textPrimary  bg-light-background dark:bg-dark-surface border-0 border-b-2 border-light-border dark:border-dark-border focus:outline-none focus:ring-0 focus:border-light-accent peer dark:focus:border-dark-accent  placeholder-light-textSecondary dark:placeholder-dark-textSecondary"
+                    placeholder=" " />
+                <label for="username"
+                    class="absolute text-lg text-light-textSecondary dark:text-dark-textSecondary  duration-300 transform -translate-y-4 scale-90 top-4 z-10 origin-[0] start-2.5  peer-focus:text-light-accent peer-focus:dark:text-dark-accent peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0  peer-focus:scale-90 peer-focus:-translate-y-4  rtl:peer-focus:translate-x-1/4 rtl:peer-focus:left-auto">
+                    <i class="fa-solid fa-user-ninja mr-1"></i>Nazwa użytkownika:
+                </label>
+            </div>
+            <!-- <div>
+                <label for="firstName">Imię:</label>
+                <input type="text" id="firstName" name="firstName" required>
+            </div> -->
+            <div class="relative m-5 w-full">
+                <input type="text" id="firstName" aria-describedby="firstName" name="firstName" required
+                    autocomplete="off"
+                    class="block rounded-t-lg px-2.5 pb-2.5 pt-5 w-full text-sm text-light-textPrimary dark:text-dark-textPrimary  bg-light-background dark:bg-dark-surface border-0 border-b-2 border-light-border dark:border-dark-border focus:outline-none focus:ring-0 focus:border-light-accent peer dark:focus:border-dark-accent  placeholder-light-textSecondary dark:placeholder-dark-textSecondary"
+                    placeholder=" " />
+                <label for="firstName"
+                    class="absolute text-lg text-light-textSecondary dark:text-dark-textSecondary  duration-300 transform -translate-y-4 scale-90 top-4 z-10 origin-[0] start-2.5  peer-focus:text-light-accent peer-focus:dark:text-dark-accent peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0  peer-focus:scale-90 peer-focus:-translate-y-4  rtl:peer-focus:translate-x-1/4 rtl:peer-focus:left-auto">
+                    <i class="fa-solid fa-user mr-1"></i>Imię:
+                </label>
+            </div>
+            <!-- <div>
+                <label for="surname">Nazwisko:</label>
+                <input type="text" id="surname" name="surname" required>
+            </div> -->
+            <div class="relative m-5 w-full">
+                <input type="text" id="surname" aria-describedby="surname" name="surname" required autocomplete="off"
+                    class="block rounded-t-lg px-2.5 pb-2.5 pt-5 w-full text-sm text-light-textPrimary dark:text-dark-textPrimary  bg-light-background dark:bg-dark-surface border-0 border-b-2 border-light-border dark:border-dark-border focus:outline-none focus:ring-0 focus:border-light-accent peer dark:focus:border-dark-accent  placeholder-light-textSecondary dark:placeholder-dark-textSecondary"
+                    placeholder=" " />
+                <label for="surname"
+                    class="absolute text-lg text-light-textSecondary dark:text-dark-textSecondary  duration-300 transform -translate-y-4 scale-90 top-4 z-10 origin-[0] start-2.5  peer-focus:text-light-accent peer-focus:dark:text-dark-accent peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0  peer-focus:scale-90 peer-focus:-translate-y-4  rtl:peer-focus:translate-x-1/4 rtl:peer-focus:left-auto">
+                    <i class="fa-solid fa-id-badge mr-1"></i>Nazwisko:
+                </label>
+            </div>
+            <!-- <div>
+                <label for="email">Email:</label>
+                <input type="email" id="email" name="email" required>
+            </div> -->
+            <div class="relative m-5 w-full">
+                <input type="email" id="email" aria-describedby="email" name="email" required autocomplete="off"
+                    class="block rounded-t-lg px-2.5 pb-2.5 pt-5 w-full text-sm text-light-textPrimary dark:text-dark-textPrimary  bg-light-background dark:bg-dark-surface border-0 border-b-2 border-light-border dark:border-dark-border focus:outline-none focus:ring-0 focus:border-light-accent peer dark:focus:border-dark-accent  placeholder-light-textSecondary dark:placeholder-dark-textSecondary"
+                    placeholder=" " />
+                <label for="email"
+                    class="absolute text-lg text-light-textSecondary dark:text-dark-textSecondary  duration-300 transform -translate-y-4 scale-90 top-4 z-10 origin-[0] start-2.5  peer-focus:text-light-accent peer-focus:dark:text-dark-accent peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0  peer-focus:scale-90 peer-focus:-translate-y-4  rtl:peer-focus:translate-x-1/4 rtl:peer-focus:left-auto">
+                    <i class="fa-solid fa-envelope mr-1"></i>Email:
+                </label>
+            </div>
+            <!-- <div>
+                <label for="role">Rola:</label>
+                <select id="role" name="role">
+                    <option value="ROLE_USER">Użytkownik</option>
+                    <option value="ROLE_ADMIN">Admin</option>
+                </select>
+            </div> -->
+            <div class="relative m-5 w-full">
+                <select id="role" name="role"
+                    class="block rounded-t-lg px-2.5 pb-2.5 pt-5 w-full text-sm text-light-textPrimary dark:text-dark-textPrimary  bg-light-background dark:bg-dark-surface border-0 border-b-2 border-light-border dark:border-dark-border  focus:outline-none focus:ring-0 focus:border-light-accent peer dark:focus:border-dark-accent  placeholder-light-textSecondary dark:placeholder-dark-textSecondary">
+                    <option value="ROLE_USER">Użytkownik</option>
+                    <option value="ROLE_ADMIN">Admin</option>
+                </select>
+                <label for="role"
+                    class="absolute text-lg text-light-textSecondary dark:text-dark-textSecondary duration-300 transform -translate-y-4 scale-90 top-4 z-10 origin-[0] start-2.5 peer-focus:text-light-accent peer-focus:dark:text-dark-accent peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-90 peer-focus:-translate-y-4 rtl:peer-focus:translate-x-1/4 rtl:peer-focus:left-auto">
+                    <i class="fa-solid fa-user-shield mr-1"></i>Rola:
+                </label>
+            </div>
+            <div class="flex flex-row">
+                <!-- <div>
+                    <label for="locked">Zablokowane konto:</label>
+                    <input type="checkbox" id="locked" name="locked">
+                </div> -->
+                <div class="relative m-5 w-full flex items-center">
+                    <label for="locked" class="ml-5 mr-3 text-lg text-light-textPrimary dark:text-dark-textPrimary">
+                        Zablokowane konto:
+                    </label>
+                    <input type="checkbox" id="locked" name="locked"
+                        class="h-4 w-4 text-light-accent dark:text-dark-accent focus:ring-0 border-light-border dark:border-dark-border rounded-lg focus:outline-none   focus:ring-2 focus:ring-light-accent dark:focus:ring-dark-accent bg-light-background dark:bg-dark-surface">
+                </div>
+                <!-- <div>
+                    <label for="enabled">Aktywny użytkownik:</label>
+                    <input type="checkbox" id="enabled" name="enabled">
+                </div> -->
+                <div class="relative m-5 w-full flex items-center">
+                    <label for="enabled" class="ml-5 mr-3 text-lg text-light-textPrimary dark:text-dark-textPrimary">
+                        Aktywny użytkownik:
+                    </label>
+                    <input type="checkbox" id="enabled" name="enabled"
+                        class="h-4 w-4 text-light-accent dark:text-dark-accent focus:ring-0 border-light-border dark:border-dark-border rounded-lg focus:outline-none   focus:ring-2 focus:ring-light-accent dark:focus:ring-dark-accent bg-light-background dark:bg-dark-surface">
+                </div>
+            </div>
+            <!-- <button type="submit">Zapisz zmiany</button> -->
+            <button
+                class="mb-[3vh] w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2 border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                type="submit">Zapisz zmiany</button>
+        </form>
+    </main>
+    <footer
+        class="w-full text-center p-4 bg-light-surface dark:bg-dark-surface font-jetbrains-mono text-light-text dark:text-dark-text border-t border-light-border dark:border-dark-border">
+        <h3 class="text-light-textPrimary dark:text-dark-textPrimary">Od Graczy dla Graczy © 2025 RPG Handy Helper</h3>
+        <a href="https://github.com/xEdziu/RPG-Handy-Helper" target="_blank"
+            class="text-light-accent dark:text-dark-accent">
+            <i class="fa-brands fa-github"></i>
+        </a>
+    </footer>
+    <script defer src="/scripts/footer.js"></script>
+</body>
+<script>
+    function getCsrfToken() {
+        const cookies = document.cookie.split(';');
+        for (let cookie of cookies) {
+            cookie = cookie.trim();
+            if (cookie.startsWith('XSRF-TOKEN=')) {
+                return cookie.substring('XSRF-TOKEN='.length);
+            }
+        }
+        return null;
+    }
+
+    document.addEventListener('DOMContentLoaded', () => {
+        const userId = new URLSearchParams(window.location.search).get('id');
+        fetch(`/api/v1/authorized/admin/user/${userId}`, {
+            method: 'GET',
+            headers: {
+                'X-XSRF-TOKEN': getCsrfToken()
+            }
+        })
+            .then(res => res.json())
+            .then(data => {
+                document.getElementById('username-form').textContent = `Edytujesz użytkownika: ${data.user.username}`;
+                document.getElementById('username').value = data.user.username;
+                document.getElementById('firstName').value = data.user.firstName;
+                document.getElementById('surname').value = data.user.surname;
+                document.getElementById('email').value = data.user.email;
+                document.getElementById('role').value = data.user.role;
+                document.getElementById('locked').checked = data.user.locked;
+                document.getElementById('enabled').checked = data.user.enabled;
+
+            });
+    });
+
+    document.querySelector('form').addEventListener('submit', (event) => {
+        event.preventDefault();
+        const userId = new URLSearchParams(window.location.search).get('id');
+        const formData = new FormData(event.target);
+        const data = Object.fromEntries(formData.entries());
+        data.locked = formData.get('locked') === 'on';
+        data.enabled = formData.get('enabled') === 'on';
+
+        console.log('Updating user with data:', data);
+
+        fetch(`/api/v1/authorized/admin/user/update/${userId}`, {
+            method: 'PUT',
+            headers: {
+                'Content-Type': 'application/json',
+                'X-XSRF-TOKEN': getCsrfToken()
+            },
+            body: JSON.stringify(data)
+        })
+            .then(res => res.json())
+            .then((data) => {
+                console.log('Response from server:', data);
+
+                if (data.error !== 200) {
+                    throw new Error(`Error ${data.error}: ${data.message}`);
+                }
+                Swal.fire({
+                    icon: 'Success',
+                    title: 'Udało się!',
+                    text: 'Użytkownik został zaktualizowany.',
+                });
+                window.location.href = '/admin/users';
+            })
+            .catch(error => {
+                console.error('Error updating user:', error);
+            });
+    });
+</script>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/users.html b/src/main/resources/templates/admin/users.html
new file mode 100644
index 00000000..f2849ccc
--- /dev/null
+++ b/src/main/resources/templates/admin/users.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html>
+<html lang="pl">
+<head>
+    <meta charset="UTF-8">
+    <title>Użytkownicy</title>
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=League+Spartan:wght@100..900&display=swap');
+
+        .font-league-spartan {
+            font-family: 'League Spartan', sans-serif;
+        }
+
+        .font-jetbrains-mono {
+            font-family: 'JetBrains Mono', monospace;
+        }
+    </style>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script> <!-- Dodanie SweetAlert2 -->
+    <script src="https://kit.fontawesome.com/0a5e3ca64c.js" crossorigin="anonymous"></script>
+    <!-- Dodanie Font Awesome -->
+    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script> <!-- Dodanie Tailwind CSS -->
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script> <!-- Dodanie Marked.js -->
+    <script>
+        // ===== Ustawienia Tailwind CSS =====
+        tailwind.config = {
+            darkMode: "class",
+            theme: {
+                extend: {
+                    colors: {
+                        dark: {
+                            background: "#1E1E1E",
+                            backgroundSecondary: "#181818",
+                            backgroundTertiary: "#101010",
+                            textPrimary: "#E1E1E1",
+                            textSecondary: "#AFAFAF",
+                            accent: "#12e1b9",
+                            border: "#333333",
+                            surface: "#1E1E1E",
+                            accentDark: "#00B189",
+                            success: "#00EE00",
+                            error: "#D00000",
+                            warning: "#FF9831",
+                        },
+                        light: {
+                            background: "#E1E1E1",
+                            backgroundSecondary: "#C1C1C1",
+                            backgroundTertiary: "#818181",
+                            textPrimary: "#252525",
+                            surface: "#F5F5F5",
+                            border: "#CCCCCC",
+                            textSecondary: "#505050",
+                            accent: "#ED1E46",
+                            accentDark: "#BD0016",
+                            success: "#009688",
+                            error: "#b388FF",
+                            warning: "#FF6F00",
+                        },
+                    },
+                },
+            },
+        };
+        document.addEventListener("DOMContentLoaded", () => {
+            initThemeToggle();
+            applyTheme(getSavedTheme());
+        });
+        function initThemeToggle() {
+            const wrapper = document.getElementById("theme-toggle-wrapper");
+            const toggle = document.getElementById("switch-component");
+            if (!toggle) return;
+
+            const updateTheme = () => {
+                const theme = toggle.checked ? "dark" : "light";
+                applyTheme(theme);
+            };
+
+            toggle.addEventListener("change", updateTheme);
+            wrapper?.addEventListener("click", () => {
+                toggle.checked = !toggle.checked;
+                updateTheme();
+            });
+        }
+        function applyTheme(theme) {
+            document.body.classList.toggle("dark", theme === "dark");
+            localStorage.setItem("theme", theme);
+            updateFavicon(theme);
+
+            const toggle = document.getElementById("switch-component");
+            if (toggle) {
+                toggle.checked = (theme === "dark");
+            }
+        }
+        function updateFavicon(theme) {
+            const favicon = document.getElementById("favicon");
+            if (favicon) {
+                favicon.href = `/img/logo/logo-${theme}.svg`;
+            }
+        }
+        function getSavedTheme() {
+            return localStorage.getItem("theme") ||
+                (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light");
+        }
+    </script>
+</head>
+
+<body>
+    <nav class="flex justify-around w-full p-6 bg-light-surface dark:bg-dark-surface border-b border-light-border
+    dark:border-dark-border">
+        <a href="/home">
+            <div class="flex items-center">
+                <img id="logo-light" src="/img/logo/logo-light.svg" alt="RPG Manager" class="h-10 w-10 dark:hidden">
+                <img id="logo-dark" src="/img/logo/logo-dark.svg" alt="RPG Manager" class="h-10 w-10 hidden dark:block">
+                <h1
+                    class="text-xl font-semibold ml-3 text-light-textPrimary dark:text-dark-textPrimary font-jetbrains-mono">
+                    RPG Handy Helper
+                </h1>
+            </div>
+        </a>
+        <div id="theme-toggle-wrapper" class="flex items-center justify-center">
+            <i class="fa-solid fa-sun p-2 text-light-accent dark:text-dark-accent"></i>
+            <div class="relative inline-block w-12 h-6">
+                <input id="switch-component" type="checkbox" class="peer hidden m-1" />
+                <label for="switch-component" class="absolute top-0.5 left-0.5 w-5 h-5 rounded-full
+                       bg-light-accent dark:bg-dark-accent
+                       shadow-md transition-all duration-300 
+                       peer-checked:translate-x-[0.75rem] 
+                       peer-checked:dark:bg-dark-accent peer-checked:bg-light-accent
+                       cursor-pointer hover:shadow-lg">
+                </label>
+                <div class="w-12 h-6 rounded-full transition-all duration-300 cursor-pointer
+                        bg-light-backgroundSecondary dark:bg-dark-backgroundTertiary">
+                </div>
+            </div>
+            <i class="fa-solid fa-moon p-2 text-light-accent dark:text-dark-accent"></i>
+        </div>
+    </nav>
+    <main
+        class="min-h-[86.75vh] flex-grow flex flex-col items-center justify-center bg-light-background dark:bg-dark-background w-full">
+        <aside class="w-[80%] text-light-textPrimary dark:text-dark-textPrimary mb-6 flex flex-row justify-center items-center mb-[3rem] gap-6">
+            <button
+                class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                onclick="location.href='/admin'">Powrót </button>
+            <button
+                class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                onclick="location.href='/admin/user/myPassword'">Moje Hasło</button>
+            <button
+                class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                onclick="location.href='/home'">Strona Domowa</button>
+            <button
+                class="w-full md:w-64 px-4 py-3 text-lg font-semibold rounded-2xl transition-all duration-300 border-2
+                border-light-accent dark:border-dark-accent text-light-textPrimary dark:text-dark-textPrimary hover:bg-light-accent
+                hover:text-light-background dark:hover:bg-dark-accent dark:hover:text-dark-background shadow-md hover:shadow-lg"
+                onclick="location.href='/logout'">
+                Wyloguj się</button>
+        </aside>
+        <table class="mt-2 w-[80%] text-light-textPrimary dark:text-dark-textPrimary gap-y-[1rem]">
+            <thead>
+                <tr
+                    class="text-base text-bold font-jetbrains-mono border-b border-light-border dark:border-dark-border">
+                    <th><p class="mx-1">ID</p></th>
+                    <th><p class="mx-1">Username</p></th>
+                    <th><p class="mx-1">First Name</p></th>
+                    <th><p class="mx-1">Surname</p></th>
+                    <th><p class="mx-1">Email</p></th>
+                    <th><p class="mx-1">Role</p></th>
+                    <th><p class="mx-1">Locked</p></th>
+                    <th><p class="mx-1">Enabled</p></th>
+                    <th><p class="mx-1">OAuthProvider</p></th>
+                    <th><p class="mx-1">Created At</p></th>
+                </tr>
+            </thead>
+            <tbody>
+
+            </tbody>
+        </table>
+    </main>
+    <footer
+        class="w-full text-center p-4 bg-light-surface dark:bg-dark-surface font-jetbrains-mono text-light-text dark:text-dark-text border-t border-light-border dark:border-dark-border">
+        <h3 class="text-light-textPrimary dark:text-dark-textPrimary">Od Graczy dla Graczy © 2025 RPG Handy Helper</h3>
+        <a href="https://github.com/xEdziu/RPG-Handy-Helper" target="_blank"
+            class="text-light-accent dark:text-dark-accent">
+            <i class="fa-brands fa-github"></i>
+        </a>
+    </footer>
+</body>
+<script defer src="/scripts/footer.js"></script>
+
+</html>
+<script>
+    function getCsrfToken() {
+        const cookies = document.cookie.split(';');
+        for (let cookie of cookies) {
+            cookie = cookie.trim();
+            if (cookie.startsWith('XSRF-TOKEN=')) {
+                return cookie.substring('XSRF-TOKEN='.length);
+            }
+        }
+        return null;
+    }
+
+    document.addEventListener('DOMContentLoaded', () => {
+        fetch('/api/v1/authorized/admin/user/all', {
+            method: 'GET',
+            headers: {
+                'X-XSRF-TOKEN': getCsrfToken()
+            }
+        }).then(res => res.json())
+            .then(data => {
+                const tbody = document.querySelector('tbody');
+                data.users.forEach(user => {
+                    const row = document.createElement('tr');
+                    row.classList.add("border-b", "border-light-border", "dark:border-dark-border", "py-5");
+                    row.innerHTML = `
+                    <td class=""><p class="py-2 md:py-5">${user.id}</p></td>
+                    <td class=""><p class="py-2 md:py-5">${user.username}</p></td>
+                    <td class=""><p class="py-2 md:py-5">${user.firstName}</p></td>
+                    <td class=""><p class="py-2 md:py-5">${user.surname}</p></td>
+                    <td class=""><p class="py-2 md:py-5">${user.email}</p></td>
+                    <td class=""><p class="py-2 md:py-5">${user.role}</p></td>
+                    <td class="text-center"><p class="py-2 md:py-5">${user.locked ? 'Yes' : 'No'}</p></td>
+                    <td class="text-center"><p class="py-2 md:py-5">${user.enabled ? 'Yes' : 'No'}</p></td>
+                    <td class="text-center"><p class="py-2 md:py-5">${user.oauthProvider || 'None'}</p></td>
+                    <td class="text-center"><p class="py-2 md:py-5">${new Date(user.createdAt).toLocaleString()}</td>
+                    <td class="py-2 md:py-5"><button class="edit-button px-3 py-2  bg-light-warning dark:bg-dark-warning rounded-md text-bold">Edytuj</button></td>
+                    <td class="py-2 md:py-5"><button class="delete-button px-3 py-2  bg-light-error dark:bg-dark-error rounded-md text-bold">Usuń</button></td>
+                `;
+                    tbody.appendChild(row);
+                });
+            }).catch(error => {
+                console.error('Error fetching users:', error);
+            }).then(() => {
+                const tbody = document.querySelector('tbody');
+                if (tbody.children.length === 0) {
+                    const row = document.createElement('tr');
+                    row.innerHTML = '<td colspan="12">Brak użytkowników</td>';
+                    tbody.appendChild(row);
+                }
+                const editButtons = document.querySelectorAll('.edit-button');
+                editButtons.forEach(button => {
+                    button.addEventListener('click', (event) => {
+                        const row = event.target.closest('tr');
+                        const userId = row.querySelector('td').textContent;
+                        window.location.href = `/admin/user/edit?id=${userId}`;
+                    });
+                });
+                const deleteButtons = document.querySelectorAll('.delete-button');
+                deleteButtons.forEach(button => {
+                    button.addEventListener('click', (event) => {
+                        const row = event.target.closest('tr');
+                        const userId = row.querySelector('td').textContent;
+                        Swal.fire({
+                            icon: 'warning',
+                            title: 'Czy na pewno?',
+                            text: `Czy na pewno chcesz usunąć użytkownika o ID ${userId}?`,
+                            showCancelButton: true,
+                            confirmButtonText: 'Tak, usuń!',
+                            cancelButtonText: 'Anuluj',
+                            reverseButtons: true
+                        }).then((result) => {
+                            if (result.isConfirmed) {
+                                fetch(`/api/v1/authorized/admin/user/delete/${userId}`, {
+                                    method: 'DELETE',
+                                    headers: {
+                                        'X-XSRF-TOKEN': getCsrfToken()
+                                    }
+                                }).then(res => {
+                                    if (res.ok) {
+                                        row.remove();
+                                        Swal.fire({
+                                            icon: 'success',
+                                            title: 'Udało się!',
+                                            text: 'Użytkownik został usunięty.',
+                                        });
+                                    } else {
+                                        Swal.fire({
+                                            icon: 'error',
+                                            title: 'Błąd',
+                                            text: 'Nie udało się usunąć użytkownika.',
+                                        });
+                                    }
+                                }).catch(error => {
+                                    console.error('Error deleting user:', error);
+                                    Swal.fire({
+                                        icon: 'error',
+                                        title: 'Błąd',
+                                        text: 'Wystąpił błąd podczas usuwania użytkownika.',
+                                    });
+                                });
+                            }
+                        });
+                    });
+                });
+            })
+    })
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/home/createGame.html b/src/main/resources/templates/home/createGame.html
new file mode 100644
index 00000000..218d6d09
--- /dev/null
+++ b/src/main/resources/templates/home/createGame.html
@@ -0,0 +1,558 @@
+<!DOCTYPE html>
+<html lang="pl">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Tworzenie Gry</title>
+    <link id="favicon" rel="icon" type="image/svg+xml" href="/img/logo/logo-light.svg">
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=League+Spartan:wght@100..900&display=swap');
+
+        .font-league-spartan {
+            font-family: 'League Spartan', sans-serif;
+        }
+
+        .font-jetbrains-mono {
+            font-family: 'JetBrains Mono', monospace;
+        }
+    </style>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script> <!-- Dodanie SweetAlert2 -->
+    <script src="https://kit.fontawesome.com/0a5e3ca64c.js" crossorigin="anonymous"></script>
+    <!-- Dodanie Font Awesome -->
+    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script> <!-- Dodanie Tailwind CSS -->
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script> <!-- Dodanie Marked.js -->
+    <script>
+        // ===== Ustawienia Tailwind CSS =====
+        tailwind.config = {
+            darkMode: "class",
+            theme: {
+                extend: {
+                    colors: {
+                        dark: {
+                            background: "#1E1E1E",
+                            backgroundSecondary: "#181818",
+                            backgroundTertiary: "#101010",
+                            textPrimary: "#E1E1E1",
+                            textSecondary: "#AFAFAF",
+                            accent: "#12e1b9",
+                            border: "#333333",
+                            surface: "#1E1E1E",
+                            accentDark: "#00B189",
+                            success: "#00EE00",
+                            successPlayer: "#02AD02",
+                            error: "#D00000",
+                            warning: "#FF9831",
+                        },
+                        light: {
+                            background: "#E1E1E1",
+                            backgroundSecondary: "#C1C1C1",
+                            backgroundTertiary: "#818181",
+                            textPrimary: "#252525",
+                            surface: "#F5F5F5",
+                            border: "#CCCCCC",
+                            textSecondary: "#505050",
+                            accent: "#ED1E46",
+                            accentDark: "#BD0016",
+                            success: "#009688",
+                            error: "#b388FF",
+                            warning: "#FF6F00",
+                        },
+                    },
+                },
+            },
+        };
+
+        // ===== Zmienne Globalne =====
+        var RpgSystem = [];
+        var userInfo = [];
+        var userList = [];
+        var gameId = null;
+        // ==== DOMContentLoaded ====
+        document.addEventListener("DOMContentLoaded", () => {
+            initThemeToggle();
+            applyTheme(getSavedTheme());
+            getUserInfo();
+            getAllSystems();
+        });
+
+        // ==== Changing the theme ====
+        function initThemeToggle() {
+            const wrapper = document.getElementById("theme-toggle-wrapper");
+            const toggle = document.getElementById("switch-component");
+            if (!toggle) return;
+
+            const updateTheme = () => {
+                const theme = toggle.checked ? "dark" : "light";
+                applyTheme(theme);
+            };
+
+            toggle.addEventListener("change", updateTheme);
+            wrapper?.addEventListener("click", () => {
+                toggle.checked = !toggle.checked;
+                updateTheme();
+            });
+        }
+
+        function applyTheme(theme) {
+            document.body.classList.toggle("dark", theme === "dark");
+            localStorage.setItem("theme", theme);
+            updateFavicon(theme);
+
+            const toggle = document.getElementById("switch-component");
+            if (toggle) {
+                toggle.checked = (theme === "dark");
+            }
+        }
+
+        function updateFavicon(theme) {
+            const favicon = document.getElementById("favicon");
+            if (favicon) {
+                favicon.href = `/img/logo/logo-${theme}.svg`;
+            }
+        }
+
+        function getSavedTheme() {
+            return localStorage.getItem("theme") ||
+                (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light");
+        }
+        // ==== CRF Token ====
+        function getCsrfToken() {
+            const name = "XSRF-TOKEN=";
+            const cookies = document.cookie.split(';');
+            for (let cookie of cookies) {
+                cookie = cookie.trim();
+                if (cookie.startsWith(name)) {
+                    return decodeURIComponent(cookie.substring(name.length));
+                }
+            }
+            return null;
+        }
+        // ==== Get All Systems ====
+        function getAllSystems() {
+            fetch('/api/v1/authorized/rpgSystems/all', {
+                method: 'GET',
+                headers: {
+                    'X-XSRF-TOKEN': getCsrfToken()
+                }
+            }).then(
+                response => {
+                    if (!response.ok) throw new Error('Network response was not ok');
+                    return response.json();
+                }
+            ).then(data => {
+                data = data.rpgSystems;
+                if (data.length == 0) {
+                    return;
+                }
+                RpgSystem = data;
+                generateSystemSelect(data);
+            }).catch(error => {
+                console.error('Error fetching user systems:', error);
+            });
+        }
+        // ==== Generate System Select ====
+        function generateSystemSelect(systems) {
+            const select = document.querySelector("select");
+            if (!select) return;
+
+            systems.forEach(system => {
+                const option = document.createElement("option");
+                option.value = system.id;
+                option.textContent = system.name;
+                select.appendChild(option);
+            });
+        }
+        // ==== Force Reload ====
+        function forceReload() {
+            location.reload();
+        }
+        // ==== Get User Info ====
+        function getUserInfo() {
+            fetch('/api/v1/authorized/user', {
+                method: 'GET',
+                headers: {
+                    'X-XSRF-TOKEN': getCsrfToken()
+                }
+            }).then(
+                response => {
+                    if (!response.ok) throw new Error('Network response was not ok');
+                    return response.json();
+                }
+            ).then(data => {
+                userInfo = data;
+                const usersList = document.getElementById("users-list");
+                const userDiv = document.createElement("div");
+                userDiv.className = "w-full flex flex-row items-center justify-between p-3 text-base md:text-xl text-light-textPrimary dark:text-dark-textPrimary";
+                userDiv.innerHTML = `
+                <p>
+                    ${userInfo.username} (Ty)
+                </p>
+                <span class="font-bold px-4 py-1"> GameMaster</span>
+                `;
+                usersList.appendChild(userDiv);
+            }).catch(error => {
+                console.error('Error fetching user info:', error);
+            });
+        }
+        // ==== Create Game ====
+        function createGame() {
+            var systemSelect = document.getElementById("systemSelect").value;
+            var gameName = document.getElementById("titleInput").value.trim();
+            var gameDescription = document.getElementById("descriptionInput").value;
+            if (!Number(systemSelect)) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Błąd',
+                    text: 'Wybierz system gry!',
+                });
+                return;
+            }
+            if (!gameName) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Błąd',
+                    text: 'Podaj nazwę gry!',
+                });
+                return;
+            }
+            if (!gameDescription) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Błąd',
+                    text: 'Podaj opis gry!',
+                });
+                return;
+            }
+            const bodyJson = {
+                name: gameName,
+                description: gameDescription,
+                rpgSystem: {
+                    id: Number(systemSelect)
+                }
+            }
+            fetch('/api/v1/authorized/game/create', {
+                method: 'POST',
+                headers: {
+                    'X-XSRF-TOKEN': getCsrfToken(),
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify(bodyJson)
+            }).then(response => {
+                if (!response.ok) throw new Error('Network response was not ok');
+                return response.json();
+            }).then(data => {
+                gameId = data.gameId;
+                return gameId;
+            }).catch(error => {
+                console.error('Error creating game:', error);
+            }).finally(() => {
+                addUsersToGame();
+            });
+        }
+        function addUsersToGame() {
+            if( userList.length === 0) {
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Sukces',
+                    text: 'Gra została utworzona!',
+                }).then(() => {
+                    window.location.href = `/home`;
+                });
+                return;
+            }
+            var usersToAdd = [];
+            userList.forEach(user => {
+                usersToAdd.push(
+                    JSON.stringify({
+                    userId: user.id,
+                    gameId: gameId,
+                    role: document.getElementById(`roleFor${user.id}`).value
+                }));
+            });
+            console.log(`gameId: ${gameId}`);
+            console.log(usersToAdd);
+            fetch('/api/v1/authorized/game/addUserToGame', {
+                method: 'POST',
+                headers: {
+                    'X-XSRF-TOKEN': getCsrfToken(),
+                    'Content-Type': 'application/json'
+                },
+                body: usersToAdd
+            }).then(response => {
+                if (!response.ok) throw new Error('Network response was not ok');
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Sukces',
+                    text: 'Gra została utworzona!',
+                }).then(() => {
+                    window.location.href = `/home`;
+                });
+            }).catch(error => {
+                console.error('Error adding users to game:', error);
+            });
+        }
+    </script>
+</head>
+
+<body>
+    <nav
+        class="flex justify-around w-full p-6 bg-light-surface dark:bg-dark-surface border-b border-light-border dark:border-dark-border">
+        <a href="/home">
+            <div class="flex items-center">
+                <img id="logo-light" src="/img/logo/logo-light.svg" alt="RPG Manager" class="h-10 w-10 dark:hidden">
+                <img id="logo-dark" src="/img/logo/logo-dark.svg" alt="RPG Manager" class="h-10 w-10 hidden dark:block">
+                <h1
+                    class="text-xl font-semibold ml-3 text-light-textPrimary dark:text-dark-textPrimary font-jetbrains-mono">
+                    RPG Handy Helper
+                </h1>
+            </div>
+        </a>
+        <div id="theme-toggle-wrapper" class="flex items-center justify-center">
+            <i class="fa-solid fa-sun p-2 text-light-accent dark:text-dark-accent"></i>
+            <div class="relative inline-block w-12 h-6">
+                <input id="switch-component" type="checkbox" class="peer hidden m-1" />
+                <label for="switch-component" class="absolute top-0.5 left-0.5 w-5 h-5 rounded-full
+                       bg-light-accent dark:bg-dark-accent
+                       shadow-md transition-all duration-300 
+                       peer-checked:translate-x-[0.75rem] 
+                       peer-checked:dark:bg-dark-accent peer-checked:bg-light-accent
+                       cursor-pointer hover:shadow-lg">
+                </label>
+                <div class="w-12 h-6 rounded-full transition-all duration-300 cursor-pointer
+                        bg-light-backgroundSecondary dark:bg-dark-backgroundTertiary">
+                </div>
+            </div>
+            <i class="fa-solid fa-moon p-2 text-light-accent dark:text-dark-accent"></i>
+        </div>
+    </nav>
+    <main
+        class="min-h-[86.75vh] flex-grow flex flex-col items-center justify-center bg-light-background dark:bg-dark-background w-full">
+        <div class="w-full p-6 flex flex-col items-center justify-center">
+            <!-- Create body -->
+            <section
+                class="w-[80vw] lg:h-[60vh] bg-light-surface dark:bg-dark-surface flex flex-col items-center justify-center rounded-lg p-8">
+                <div id="create-game-header"
+                    class="w-full h-[85%] bg-light-surface dark:bg-dark-surface flex flex-col lg:flex-row items-center justify-center rounded-lg gap-8 mb-4">
+                    <article id="create-game-info"
+                        class="w-[45%] h-[100%] flex flex-col items-center justify-center w-full gap-4">
+                        <select id="systemSelect"
+                            class="text-base md:text-2xl w-full p-3 rounded-md border border-light-border dark:border-dark-border bg-light-surface dark:bg-dark-surface text-light-textPrimary dark:text-dark-textPrimary">
+                            <option disabled selected>System gry</option>
+                        </select>
+
+                        <input id="titleInput" type="text" placeholder="Nazwa gry"
+                            class="text-base md:text-2xl w-full p-3 rounded-md border border-light-border dark:border-dark-border bg-light-surface dark:bg-dark-surface text-light-textPrimary dark:text-dark-textPrimary"  maxlength="75"/>
+
+                        <textarea id="descriptionInput" placeholder="Opis gry"
+                            class="text-base md:text-2xl h-[20vh] lg:h-full w-full p-3 rounded-md border border-light-border dark:border-dark-border bg-light-surface dark:bg-dark-surface text-light-textPrimary dark:text-dark-textPrimary resize-none"></textarea>
+                    </article>
+                    <article id="user-box"
+                        class="w-[45%] h-[40vh] lg:h-full flex flex-col items-center justify-center w-full rounded-md border border-light-border dark:border-dark-border">
+                        <div id="users-list"
+                            class="w-full h-full flex flex-col items-center justify-start gap-4 overflow-y-auto">
+
+                        </div>
+                        <!-- Add user button -->
+                        <div class="w-full flex items-end justify-end p-4">
+                            <div id="add-user"
+                                class="w-10 h-10 md:w-20 md:h-20 rounded-full bg-light-accent dark:bg-dark-accent text-dark-textPrimary dark:text-light-textPrimary hover:bg-light-accentDark dark:hover:bg-dark-accentDark transitionduration-300 cursor-pointer flex items-center justify-center"
+                                onclick="addUserToListHTML()">
+                                <i class="fa-solid fa-plus text-3xl md:text-5xl"></i>
+                            </div>
+                        </div>
+                    </article>
+                </div>
+                <div id="buttons-div" class="h-[15%] flex flex-row items-center justify-center gap-8 flex-wrap">
+                    <button
+                        class="text-2xl sm:text-3xl py-4 px-5 sm:px-10 bg-light-accent dark:bg-dark-accent text-dark-textPrimary dark:text-light-textPrimary rounded-lg hover:bg-light-accentDark dark:hover:bg-dark-accentDark transition duration-300 whitespace-nowrap font-bold font-jetbrains-mono disabled:dark:bg-dark-accentDark disabled:cursor-not-allowed disabled:bg-light-accentDark disabled:opacity-50"
+                        onclick="createGame()">
+                        UTWÓRZ GRĘ
+                    </button>
+                    <button
+                        class="text-2xl sm:text-3xl py-4 px-5 sm:px-10 bg-light-accent dark:bg-dark-accent text-dark-textPrimary dark:text-light-textPrimary rounded-lg hover:bg-light-accentDark dark:hover:bg-dark-accentDark transition duration-300 whitespace-nowrap font-bold font-jetbrains-mono disabled:dark:bg-dark-accentDark disabled:cursor-not-allowed disabled:bg-light-accentDark disabled:opacity-50" href="location.href='/home/games'">
+                        ANULUJ
+                    </button>
+                </div>
+            </section>
+            <!-- Backdrop -->
+            <div id="editor-backdrop"
+                class="fixed inset-0 z-50 flex items-center justify-center opacity-0 pointer-events-none bg-black/30 dark:bg-black/50 transition-opacity duration-300">
+                <div id="create-editor"
+                    class="h-[50vh] w-[90vw] sm:w-[95vw] md:w-[70vw] lg:w-[50vw] bg-white dark:bg-dark-surface text-black dark:text-white p-6 px-10 rounded-lg shadow-xl overflow-auto flex-col justify-between transition-all duration-300 ease-in-out scale-100 opacity-100">
+
+                </div>
+            </div>
+        </div>
+    </main>
+
+    <footer
+        class="w-full text-center p-4 bg-light-surface dark:bg-dark-surface font-jetbrains-mono text-light-text dark:text-dark-text border-t border-light-border dark:border-dark-border">
+        <h3 class="text-light-textPrimary dark:text-dark-textPrimary">Od Graczy dla Graczy © 2025 RPG Handy Helper</h3>
+        <a href="https://github.com/xEdziu/RPG-Handy-Helper" target="_blank"
+            class="text-light-accent dark:text-dark-accent">
+            <i class="fa-brands fa-github"></i>
+        </a>
+    </footer>
+</body>
+<script defer src="/scripts/footer.js"></script>
+
+</html>
+<script>
+    document.addEventListener("click", function (e) {
+        const backdrop = document.getElementById("editor-backdrop");
+        const editor = document.getElementById("create-editor");
+        if (
+            backdrop.classList.contains("opacity-100") &&
+            !editor.contains(e.target) &&
+            !e.target.closest("#add-user")
+        ) {
+            backdrop.classList.add("opacity-0", "pointer-events-none");
+            backdrop.classList.remove("opacity-100", "pointer-events-auto");
+            editor.classList.add("scale-95", "opacity-0");
+            editor.classList.remove("scale-100", "opacity-100");
+        }
+    });
+    function closeEditor() {
+        const backdrop = document.getElementById("editor-backdrop");
+        const editor = document.getElementById("create-editor");
+        backdrop.classList.add("opacity-0", "pointer-events-none");
+        backdrop.classList.remove("opacity-100", "pointer-events-auto");
+        editor.classList.add("scale-95", "opacity-0");
+        editor.classList.remove("scale-100", "opacity-100");
+    }
+    function deleteUserFromList(userId) {
+        const userIndex = userList.findIndex(user => user.id === userId);
+        if (userIndex !== -1) {
+            userList.splice(userIndex, 1);
+            const userDiv = document.getElementById(`user-${userId}`);
+            if (userDiv) {
+                userDiv.remove();
+            }
+        }
+    }
+    function addUserToList(user) {
+        userList.push(user);
+        const divUserList = document.getElementById("users-list");
+        const userDiv = document.createElement("div");
+        userDiv.className = "w-full flex flex-row items-center justify-between p-1 text-xl text-light-textPrimary dark:text-dark-textPrimary";
+        userDiv.id = `user-${user.id}`;
+        userDiv.innerHTML = userHTML(user);
+        divUserList.appendChild(userDiv);
+        const select = userDiv.querySelector(".roleSelect");
+        if (select) updateRoleColor(select);
+        closeEditor();
+    }
+    function updateRoleColor(selectElement) {
+        const role = selectElement.value;
+        const isDark = document.body.classList.contains("dark");
+        selectElement.classList.remove(
+            "bg-light-warning", "bg-light-error", "bg-light-success",
+            "bg-dark-warning", "bg-dark-error", "bg-dark-success",
+            "text-dark-textPrimary", "text-dark-textPrimary"
+        );
+        const colorClass = {
+            PLAYER: isDark ? "bg-dark-warning" : "bg-light-warning",
+            GAMEMASTER: isDark ? "bg-dark-error" : "bg-light-error",
+            SPECTATOR: isDark ? "bg-dark-successPlayer" : "bg-light-success",
+        }[role];
+        const textColor = isDark ? "text-dark-textPrimary" : "text-dark-textPrimary";
+        if (colorClass) {
+            selectElement.classList.add(colorClass, textColor);
+        }
+    }
+
+    function searchUser() {
+        const username = document.getElementById("usernameInput").value.trim();
+        if (!username) return;
+        fetch(`/api/v1/authorized/user/find/${username}`, {
+            method: 'GET',
+            headers: {
+                'X-XSRF-TOKEN': getCsrfToken()
+            }
+        })
+            .then(response => {
+                if (!response.ok) throw new Error('Network response was not ok');
+                return response.json();
+            })
+            .then(data => {
+                const usersListSearch = document.getElementById("users-list-search");
+                usersListSearch.innerHTML = '';
+                const filteredUsers = data.users
+                    .filter(user =>
+                        user.id !== userInfo.id &&
+                        !userList.some(u => u.id === user.id)
+                    )
+                    .slice(0, 5);
+                if (filteredUsers.length === 0) {
+                    usersListSearch.innerHTML = `
+                <span class="text-xl text-light-textPrimary dark:text-dark-textPrimary font-bold mt-[18vh]">
+                    Nie ma użytkownika o podanej nazwie.
+                </span>`;
+                    return;
+                }
+                filteredUsers.forEach(user => {
+                    userAddHTML(user);
+                });
+            })
+            .catch(error => {
+                console.error('Error searching for user:', error);
+            });
+    }
+
+    function addUserToListHTML() {
+        document.getElementById("editor-backdrop").classList.remove("opacity-0", "pointer-events-none");
+        document.getElementById("editor-backdrop").classList.add("opacity-100", "pointer-events-auto");
+        document.getElementById("create-editor").classList.remove("scale-95", "opacity-0");
+        document.getElementById("create-editor").classList.add("scale-100", "opacity-100");
+        const editor = document.getElementById("create-editor");
+        editor.innerHTML = `
+            <div class="w-full flex flex-col items-center justify-center">
+                <div class="h-[2rem] w-[80%] flex items-center justify-center">
+                    <h1 class="text-base md:text-xl font-bold mx-4">Wyszukaj</h1>
+                    <input type="text" id="usernameInput" placeholder="Nazwa użytkownika" oninput="searchUser()"
+                        class="text-md w-[80%] p-1 rounded-md border border-light-border dark:border-dark-border bg-light-surface dark:bg-dark-surface text-light-textPrimary dark:text-dark-textPrimary">
+                </div>
+                <div id="users-list-search"
+                    class="w-full flex flex-col items-center justify-start gap-1 overflow-y-auto">
+                    <span class="text-base md:text-xl text-light-textPrimary dark:text-dark-textPrimary font-bold mt-[18vh]">
+                        Wpisz nazwę użytkownika,<br>
+                        aby móc dodać go do gry.
+                    </span>
+                </div>
+            </div>
+        `;
+    }
+    function userAddHTML(user) {
+        const usersList = document.getElementById("users-list-search");
+        const userDiv = document.createElement("div");
+        userDiv.className = "user-item w-full flex flex-row items-center justify-start p-4 text-xl bg-light-background dark:bg-dark-background rounded-md";
+        userDiv.innerHTML = `
+            <img src="${user.userPhotoPath}" alt="User Avatar" class="w-12 h-12 rounded-full">
+            <span class="w-[40%] font-bold px-4 py-2">${user.username}</span>
+        `
+        userDiv.addEventListener("click", () => {
+            addUserToList(user);
+        });
+        usersList.appendChild(userDiv);
+    }
+    function userHTML(user) {
+        return `
+        <p>
+            <i class="fa-solid fa-xmark mx-3" onclick=deleteUserFromList(${user.id})></i>${user.username}
+        </p>
+        <select id="roleFor${user.id}" onchange="updateRoleColor(this)" class="roleSelect w-[40%] font-bold mr-3 px-4 py-2 rounded-md transition duration-200">
+            <option value="PLAYER">Player</option>
+            <option value="SPECTATOR">Spectator</option>
+            <option value="GAMEMASTER">GameMaster</option>
+        </select>
+        `
+    }
+    const bodyObserver = new MutationObserver(() => {
+        document.querySelectorAll(".roleSelect").forEach(select => {
+            updateRoleColor(select);
+        });
+    });
+    bodyObserver.observe(document.body, { attributes: true, attributeFilter: ["class"] });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/home/games.html b/src/main/resources/templates/home/games.html
new file mode 100644
index 00000000..c3bda3e6
--- /dev/null
+++ b/src/main/resources/templates/home/games.html
@@ -0,0 +1,268 @@
+<!DOCTYPE html>
+<html lang="pl">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Mój Profil</title>
+    <link id="favicon" rel="icon" type="image/svg+xml" href="/img/logo/logo-light.svg">
+    <link rel="stylesheet" href="https://unpkg.com/cropperjs@1.5.13/dist/cropper.min.css">
+    <script src="https://unpkg.com/cropperjs@1.5.13/dist/cropper.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=League+Spartan:wght@100..900&display=swap');
+
+        .font-league-spartan {
+            font-family: 'League Spartan', sans-serif;
+        }
+
+        .font-jetbrains-mono {
+            font-family: 'JetBrains Mono', monospace;
+        }
+    </style>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script> <!-- Dodanie SweetAlert2 -->
+    <script src="https://kit.fontawesome.com/0a5e3ca64c.js" crossorigin="anonymous"></script>
+    <!-- Dodanie Font Awesome -->
+    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script> <!-- Dodanie Tailwind CSS -->
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script> <!-- Dodanie Marked.js -->
+    <script>// Ustawienia Tailwind CSS
+    <script src="https://kit.fontawesome.com/0a5e3ca64c.js" crossorigin="anonymous"></script>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script>
+
+        tailwind.config = {
+            darkMode: "class",
+            theme: {
+                extend: {
+                    colors: {
+                        dark: {
+                            background: "#1E1E1E",
+                            backgroundSecondary: "#181818",
+                            backgroundTertiary: "#101010",
+                            textPrimary: "#E1E1E1",
+                            textSecondary: "#AFAFAF",
+                            accent: "#12e1b9",
+                            border: "#333333",
+                            surface: "#323232",
+                            accentDark: "#00B189",
+                            success: "#00EE00",
+                            error: "#D00000",
+                            warning: "#FF9831",
+                        },
+                        light: {
+                            background: "#E1E1E1",
+                            backgroundSecondary: "#C1C1C1",
+                            backgroundTertiary: "#818181",
+                            textPrimary: "#252525",
+                            surface: "#F5F5F5",
+                            border: "#CCCCCC",
+                            textSecondary: "#505050",
+                            accent: "#ED1E46",
+                            accentDark: "#BD0016",
+                            success: "#009688",
+                            error: "#b388FF",
+                            warning: "#FF6F00",
+                        },
+                    }
+                }
+            }
+        };
+    </script>
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono&family=League+Spartan&display=swap');
+
+        .font-league-spartan {
+            font-family: 'League Spartan', sans-serif;
+        }
+
+        .font-jetbrains-mono {
+            font-family: 'JetBrains Mono', monospace;
+        }
+    </style>
+</head>
+
+<body class="min-h-screen flex flex-col font-league-spartan text-light-textPrimary dark:text-dark-textPrimary">
+<nav class="flex justify-around w-full p-6 bg-light-surface dark:bg-dark-surface border-b border-light-border dark:border-dark-border">
+    <a href="/">
+        <div class="flex items-center">
+            <img id="logo-light" src="/img/logo/logo-light.svg" alt="RPG Manager" class="h-10 w-10 dark:hidden">
+            <img id="logo-dark" src="/img/logo/logo-dark.svg" alt="RPG Manager" class="h-10 w-10 hidden dark:block">
+            <h1 class="text-xl font-semibold ml-3 text-light-textPrimary dark:text-dark-textPrimary font-jetbrains-mono">
+                RPG Handy Helper
+            </h1>
+        </div>
+    </a>
+    <div class="flex items-center justify-center">
+        <i class="fa-solid fa-sun p-2 text-light-accent dark:text-dark-accent"></i>
+        <div class="relative inline-block w-12 h-6">
+            <input id="switch-component" type="checkbox" class="peer hidden m-1" />
+            <label for="switch-component" class="absolute top-0.5 left-0.5 w-5 h-5 rounded-full
+                           bg-light-accent dark:bg-dark-accent
+                           shadow-md transition-all duration-300
+                           peer-checked:translate-x-[0.75rem]
+                           peer-checked:dark:bg-dark-accent peer-checked:bg-light-accent
+                           cursor-pointer hover:shadow-lg">
+            </label>
+            <div class="w-12 h-6 rounded-full transition-all duration-300 cursor-pointer
+                            bg-light-backgroundSecondary dark:bg-dark-backgroundSecondary">
+            </div>
+        </div>
+        <i class="fa-solid fa-moon p-2 text-light-accent dark:text-dark-accent"></i>
+    </div>
+</nav>
+
+<main class="flex-grow w-full h-full bg-light-background dark:bg-dark-background">
+    <div class="flex flex-col items-center p-4 space-y-4 max-w-5xl mx-auto">
+        <h2 class="text-3xl font-bold font-jetbrains-mono text-center text-light-textPrimary dark:text-dark-textPrimary">MOJE GRY</h2>
+
+        <div class="flex flex-col md:flex-row md:justify-between w-full gap-2">
+            <a href="/create-game" class="bg-light-accent dark:bg-dark-accent hover:bg-light-accentDark dark:hover:bg-dark-accentDark text-dark-textPrimary dark:text-light-textPrimary px-6 py-2 rounded font-bold text-center">
+                UTWÓRZ NOWĄ GRĘ
+            </a>
+
+            <div class="flex items-center w-full md:w-auto">
+                <input type="text" id="searchInput" placeholder="Wyszukaj" class="w-full md:w-64 px-4 py-2 rounded-l border border-gray-300 dark:border-gray-600 bg-white dark:bg-dark-surface text-black dark:text-dark-textPrimary" />
+                <button id="searchBtn" class="px-4 py-2 bg-gray-300 dark:bg-gray-600 rounded-r text-black dark:text-white">
+                    <i class="fas fa-search"></i>
+                </button>
+            </div>
+        </div>
+
+        <div id="gamesContainer" class="flex flex-col gap-4 w-full"></div>
+    </div>
+</main>
+
+<footer
+        class="w-full text-center p-4 bg-light-surface dark:bg-dark-surface font-jetbrains-mono text-light-text dark:text-dark-text border-t border-light-border dark:border-dark-border">
+    <h3 class="text-light-textPrimary dark:text-dark-textPrimary">Od Graczy dla Graczy © 2025 RPG Handy Helper</h3>
+    <a href="https://github.com/xEdziu/RPG-Handy-Helper" target="_blank"
+       class="text-light-accent dark:text-dark-accent"><i class="fa-brands fa-github"></i></a>
+</footer>
+</body>
+
+<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        const toggleSwitch = document.getElementById("switch-component");
+        const body = document.body;
+        const themeToggleDiv = document.querySelector(".flex.items-center.justify-center");
+        const favicon = document.getElementById("favicon");
+        function updateFavicon(theme) {
+            if (favicon) {
+                favicon.href = theme === "dark"
+                    ? "/img/logo/logo-dark.svg"
+                    : "/img/logo/logo-light.svg";
+            }
+        }
+        function applyTheme(theme) {
+            body.classList.toggle("dark", theme === "dark");
+            localStorage.setItem("theme", theme);
+            updateFavicon(theme);
+            if (toggleSwitch) toggleSwitch.checked = (theme === "dark");
+        }
+        const savedTheme = localStorage.getItem("theme") || "dark";
+        applyTheme(savedTheme);
+        if (toggleSwitch) {
+            toggleSwitch.addEventListener("change", function () {
+                const newTheme = toggleSwitch.checked ? "dark" : "light";
+                applyTheme(newTheme);
+            });
+        }
+        if (themeToggleDiv) {
+            themeToggleDiv.addEventListener("click", function (e) {
+                if (e.target.tagName === 'INPUT' || e.target.tagName === 'LABEL') return;
+                const newTheme = body.classList.contains("dark") ? "light" : "dark";
+                applyTheme(newTheme);
+            });
+        }
+    });
+
+    document.addEventListener("DOMContentLoaded", async () => {
+        const userRes = await fetch("/api/v1/authorized/user");
+        const user = await userRes.json();
+        const userId = user.id;
+
+        const searchInput = document.getElementById("searchInput");
+        const searchBtn = document.getElementById("searchBtn");
+        const gamesContainer = document.getElementById("gamesContainer");
+
+        async function loadGames(query = "") {
+            const res = await fetch("/api/v1/authorized/game/userGames");
+            const data = await res.json();
+            const games = data.userGames || [];
+
+            gamesContainer.innerHTML = "";
+
+            const filteredGames = games.filter(g =>
+                g.name.toLowerCase().includes(query.toLowerCase())
+            );
+
+            if (filteredGames.length === 0) {
+                const skibidiTexts = [
+                    "Wyrusz na szlak, gdzie magia i miecz rozstrzygają o losie świata.",
+                    "Gobliny się nudzą, smoki ziewają — potrzebują nowej rozróby.",
+                    "Głosy z innego świata wzywają... czy odważysz się im odpowiedzieć?",
+                    "Każdy świat potrzebuje Mistrza Gry… może właśnie Ciebie?",
+                    "Wkrocz w nieznane uniwersum, gdzie granice wyznacza jedynie twoja wyobraźnia.",
+                    "Z chaosu pomysłów wykreuj przygodę, którą inni zapamiętają na zawsze.",
+                    "Zainicjuj przygodę, która zmieni zwykły wieczór w noc pełną emocji.",
+                    "Otwórz księgę przygody — nie czekaj, zanim zrobi to ktoś inny.",
+                    "Ktoś musi uratować świat… albo przynajmniej dobrze się bawić próbując.",
+                    "Tylko jedno kliknięcie dzieli cię od świata, w którym wszystko może się wydarzyć."
+                ];
+                const randomIndex = Math.floor(Math.random() * skibidiTexts.length);
+                const message = query
+                    ? "Brak gier o podanej nazwie."
+                    : `Nie należysz jeszcze do żadnych gier!<br><em>${skibidiTexts[randomIndex]}</em><br>Utwórz swoją pierwszą grę już teraz.`;
+
+                "Nie należysz jeszcze do żadnych gier!<br>Utwórz swoją pierwszą grę już teraz.";
+                gamesContainer.innerHTML = `<div class="bg-white dark:bg-dark-surface p-4 rounded shadow text-light-textPrimary dark:text-dark-textPrimary">${message}</div>`;
+                return;
+            }
+
+            for (const game of filteredGames) {
+                const playersRes = await fetch(`/api/v1/authorized/game/allPlayers/${game.id}`);
+                const playersData = await playersRes.json();
+                const players = playersData.gameUsers || [];
+
+                const yourEntry = players.find(p => p.userId === userId);
+                const role = (yourEntry?.role || "").toLowerCase();
+                const roleColor =
+                    role === "player" ? "bg-orange-500" :
+                        role === "gamemaster" ? "bg-purple-400" :
+                            "bg-gray-400";
+
+                const roleText = yourEntry?.role || "Nieznana";
+
+
+                gamesContainer.innerHTML += `
+                    <a href="/game/${game.id}" class="block hover:shadow-lg transition-shadow duration-200">
+                        <div class="bg-white dark:bg-dark-surface p-4 rounded shadow flex flex-col md:flex-row md:items-center md:justify-between">
+                            <div>
+                                <p class="text-sm text-red-700 font-semibold text-light-accent dark:text-dark-accent">${game.rpgSystemName}</p>
+                                <h3 class="text-xl font-bold text-light-textPrimary dark:text-dark-textPrimary">${game.name}</h3>
+                                <p class="text-gray-600 dark:text-gray-300">${game.description}</p>
+                            </div>
+                            <div class="mt-2 md:mt-0 md:text-right text-light-textPrimary dark:text-dark-textPrimary">
+                                <p class="text-sm">Liczba graczy: <span class="font-bold">${players.length}</span></p>
+                                <p class="text-sm">Twoja rola:</p>
+                                <span class="text-white px-2 py-1 rounded ${roleColor}">${roleText}</span>
+                            </div>
+                        </div>
+                    </a>
+                `;
+            }
+        }
+
+        searchBtn.addEventListener("click", () => {
+            loadGames(searchInput.value);
+        });
+
+        searchInput.addEventListener("keypress", e => {
+            if (e.key === "Enter") loadGames(searchInput.value);
+        });
+
+        loadGames();
+    });
+</script>
+<script defer src="/scripts/footer.js"></script>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html
index cf08f4ff..c64d4f32 100644
--- a/src/main/resources/templates/home/home.html
+++ b/src/main/resources/templates/home/home.html
@@ -3,54 +3,255 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Panel użytkownika</title>
+    <title>Mój Profil</title>
+    <link id="favicon" rel="icon" type="image/svg+xml" href="/img/logo/logo-light.svg">
+    <link rel="stylesheet" href="https://unpkg.com/cropperjs@1.5.13/dist/cropper.min.css">
+    <script src="https://unpkg.com/cropperjs@1.5.13/dist/cropper.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=League+Spartan:wght@100..900&display=swap');
+
+        .font-league-spartan {
+            font-family: 'League Spartan', sans-serif;
+        }
+
+        .font-jetbrains-mono {
+            font-family: 'JetBrains Mono', monospace;
+        }
+    </style>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script> <!-- Dodanie SweetAlert2 -->
+    <script src="https://kit.fontawesome.com/0a5e3ca64c.js" crossorigin="anonymous"></script>
+    <!-- Dodanie Font Awesome -->
+    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script> <!-- Dodanie Tailwind CSS -->
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script> <!-- Dodanie Marked.js -->
+    <script>// Ustawienia Tailwind CSS
+    <script src="https://kit.fontawesome.com/0a5e3ca64c.js" crossorigin="anonymous"></script>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script>
+
+        tailwind.config = {
+            darkMode: "class",
+            theme: {
+                extend: {
+                    colors: {
+                        dark: {
+                            background: "#1E1E1E",
+                            backgroundSecondary: "#181818",
+                            backgroundTertiary: "#101010",
+                            textPrimary: "#E1E1E1",
+                            textSecondary: "#AFAFAF",
+                            accent: "#12e1b9",
+                            border: "#333333",
+                            surface: "#1E1E1E",
+                            accentDark: "#00B189",
+                            success: "#00EE00",
+                            error: "#D00000",
+                            warning: "#FF9831",
+                        },
+                        light: {
+                            background: "#E1E1E1",
+                            backgroundSecondary: "#C1C1C1",
+                            backgroundTertiary: "#818181",
+                            textPrimary: "#252525",
+                            surface: "#F5F5F5",
+                            border: "#CCCCCC",
+                            textSecondary: "#505050",
+                            accent: "#ED1E46",
+                            accentDark: "#BD0016",
+                            success: "#009688",
+                            error: "#b388FF",
+                            warning: "#FF6F00",
+                        },
+                    }
+                }
+            }
+        };
+    </script>
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono&family=League+Spartan&display=swap');
+
+        .font-league-spartan {
+            font-family: 'League Spartan', sans-serif;
+        }
+
+        .font-jetbrains-mono {
+            font-family: 'JetBrains Mono', monospace;
+        }
+    </style>
 </head>
-<body>
-<h1>Witaj na swoim koncie!</h1>
-<p>Zalogowałeś się pomyślnie.</p>
-<br>
-<a href="/profile">Mój profil</a>
-<p>UWAGA: Ten formularz jest do testowania ustawienia hasła, gdy użytkownik zarejestruje się poprzez Discord!</p>
-<p>Jest tutaj tymczasowo, w przyszłości będzie na to osobne miejsce na panelu użytkownika</p>
-<form>
-    <label for="password1">Hasło:</label><br>
-    <input type="password" id="password1" name="password" required><br>
-    <label for="password2">Powtórz Hasło:</label><br>
-    <input type="password" id="password2" name="password" required><br>
-    <button type="submit">Ustaw hasło</button>
-</form>
-<a href="/logout">Wyloguj się</a>
+
+<body class="md:h-screen overflow-hidden flex flex-col bg-light-background dark:bg-dark-background font-league-spartan text-light-textPrimary dark:text-dark-textPrimary relative">
+
+<nav class="flex justify-around w-full p-4 bg-light-surface dark:bg-dark-surface border-b border-light-border dark:border-dark-border z-20">
+    <a href="/">
+        <div class="flex items-center">
+            <img id="logo-light" src="/img/logo/logo-light.svg" alt="RPG Manager" class="h-10 w-10 dark:hidden">
+            <img id="logo-dark" src="/img/logo/logo-dark.svg" alt="RPG Manager" class="h-10 w-10 hidden dark:block">
+            <h1 class="text-xl font-semibold ml-3 text-light-textPrimary dark:text-dark-textPrimary font-jetbrains-mono">
+                RPG Handy Helper
+            </h1>
+        </div>
+    </a>
+    <div class="flex items-center justify-center">
+        <i class="fa-solid fa-sun p-2 text-light-accent dark:text-dark-accent"></i>
+        <div class="relative inline-block w-12 h-6">
+            <input id="switch-component" type="checkbox" class="peer hidden m-1" />
+            <label for="switch-component" class="absolute top-0.5 left-0.5 w-5 h-5 rounded-full
+                       bg-light-accent dark:bg-dark-accent
+                       shadow-md transition-all duration-300
+                       peer-checked:translate-x-[0.75rem]
+                       peer-checked:dark:bg-dark-accent peer-checked:bg-light-accent
+                       cursor-pointer hover:shadow-lg">
+            </label>
+            <div class="w-12 h-6 rounded-full transition-all duration-300 cursor-pointer
+                        bg-light-backgroundSecondary dark:bg-dark-backgroundSecondary">
+            </div>
+        </div>
+        <i class="fa-solid fa-moon p-2 text-light-accent dark:text-dark-accent"></i>
+    </div>
+</nav>
+
+
+<main class="flex flex-1 overflow-hidden">
+    <button id="sidebarToggle" class="md:hidden fixed top-4 left-4 z-50 p-2 bg-light-accent text-white rounded">
+        <i class="fas fa-bars"></i>
+    </button>
+    <aside id="sidebar" class="fixed top-0 left-0 h-full w-64 transform -translate-x-full md:translate-x-0 md:static
+           flex flex-col items-center justify-center gap-4 p-4 bg-light-surface dark:bg-dark-surface
+           transition-transform duration-300 z-10">
+        <nav class="flex flex-col w-full items-center gap-8">
+            <div class="w-24 h-24 bg-light-border dark:bg-dark-border rounded-full flex items-center justify-center text-3xl">
+                <i class="fa-regular fa-user"></i>
+            </div>
+            <a href="home/profile" class="bg-light-accent dark:bg-dark-accent text-white px-4 py-2 rounded text-center w-3/4">MÓJ PROFIL</a>
+            <a href="/home/gameList" class="bg-light-accent dark:bg-dark-accent text-white px-4 py-2 rounded text-center w-3/4">MOJE GRY</a>
+            <a href="/home/notes" class="bg-light-accent dark:bg-dark-accent text-white px-4 py-2 rounded text-center w-3/4">MOJE NOTATKI</a>
+            <a href="#" class="bg-light-accent dark:bg-dark-accent text-white px-4 py-2 rounded text-center w-3/4">MOJE SPOTKANIA</a>
+            <a href="#" class="border border-light-border dark:border-dark-border px-4 py-2 rounded text-center w-3/4">WYLOGUJ SIĘ</a>
+        </nav>
+    </aside>
+
+
+    <section class="flex-1 p-6 overflow-hidden flex flex-col">
+        <div class="flex items-center mb-6">
+            <h2 class="text-5xl font-bold">Cześć, <span id ="username" class="text-light-accent dark:text-dark-accent">[username]</span>!</h2>
+        </div>
+
+        <div class="col-span-1 grid grid-cols-1 md:grid-cols-3 grid-rows-1 md:grid-rows-2 gap-6 h-full">
+            <div class="md:col-span-2 row-span-1 bg-white dark:bg-dark-surface rounded-lg shadow p-4"></div>
+
+            <div class="col-span-1 row-span-1 bg-white dark:bg-dark-surface rounded-lg shadow p-4 overflow-y-auto">
+                <h3 class="text-xl font-bold mb-4">Moje Notatki</h3>
+                <ul id="notes-list" class="space-y-4">
+
+                </ul>
+            </div>
+
+            <div id="scheduler-info" class="col-span-1 row-span-1 bg-white dark:bg-dark-surface rounded-lg shadow p-4 min-h-64 overflow-y-auto">
+                <h3 class="text-xl font-bold mb-4">Twoje Spotkania</h3>
+                <div id="scheduler-content" class="space-y-2 text-sm">
+                    <p>Ładowanie danych...</p>
+                </div>
+            </div>
+
+
+            <div class="md:col-span-2 row-span-1 bg-white dark:bg-dark-surface rounded-lg shadow p-4"></div>
+        </div>
+    </section>
+</main>
+
+<footer class="w-full text-center pt-2 pb-1 bg-light-surface dark:bg-dark-surface font-jetbrains-mono text-light-text dark:text-dark-text border-t border-light-border dark:border-dark-border z-20">
+    <h3 class="text-light-textPrimary dark:text-dark-textPrimary">Z miłości do TTRPG 💙 © 2025 RPG Handy Helper</h3>
+    <a href="/home/notes" class="text-light-accent dark:text-dark-accent"><i class="fa-brands fa-github"></i></a>
+</footer>
 </body>
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
 <script>
 
-    function getCookie(name) {
-        const cookies = document.cookie.split('; ');
-        for (let cookie of cookies) {
-            const [cookieName, cookieValue] = cookie.split('=');
-            if (cookieName === name) {
-                return decodeURIComponent(cookieValue);
-            }
-        }
-        return null;
+        document.addEventListener("DOMContentLoaded", async () => {
+        const contentEl = document.getElementById("scheduler-content");
+
+        const renderError = (msg) => {
+        contentEl.innerHTML = `<p class="text-red-500">${msg}</p>`;
+    };
+
+        const createCard = (title, bodyHTML) => `
+        <div class="p-4 border rounded bg-light-backgroundSecondary dark:bg-dark-backgroundSecondary space-y-1">
+            <p class="font-bold">${title}</p>
+            ${bodyHTML}
+        </div>
+    `;
+
+        try {
+        // 1. Pobierz gry użytkownika
+        const gamesRes = await fetch("http://localhost:8888/api/v1/authorized/game/userGames");
+        const gamesData = await gamesRes.json();
+
+        if (!gamesData.games || gamesData.games.length === 0) {
+        contentEl.innerHTML = `<p>Nie masz jeszcze przypisanej żadnej gry.</p>`;
+        return;
     }
 
-    let form = document.querySelector('form');
-    form.addEventListener('submit', function (event) {
-        event.preventDefault();
+        // 2. Pobierz wszystkie pending schedulery
+        const pendingRes = await fetch("http://localhost:8888/api/v1/authorized/schedulers/pendingSchedulers");
+        const pendingData = await pendingRes.json();
+        const pendingSchedulers = pendingData.pendingSchedulers || [];
 
-        let password1 = document.querySelector('#password1').value;
-        let password2 = document.querySelector('#password2').value;
+        // 3. Przetwórz każdą grę osobno
+        let htmlOutput = "";
 
-        if (password1 !== password2) {
-            Swal.fire({
-                title: 'Błąd',
-                text: 'Hasła nie są takie same',
-                icon: 'error',
-                confirmButtonText: 'OK'
-            })
-        }
+        for (const game of gamesData.games) {
+        const gameId = game.id;
+        const gameName = game.name || "Gra bez nazwy";
+
+        // 🔸 Filtruj schedulery do tej gry
+        const schedulers = pendingSchedulers.filter(s => s.gameId === gameId);
+
+        if (schedulers.length > 0) {
+        const schedHTML = schedulers.map(s => `
+                    <div class="text-sm">
+                        <p class="font-semibold">${s.title}</p>
+                        <p class="text-xs text-gray-500">Deadline: ${new Date(s.deadline).toLocaleDateString()}</p>
+                        <p class="text-xs text-gray-500">Brakuje odpowiedzi: ${s.missingAvailabilitiesCount}</p>
+                    </div>
+                `).join("<hr class='my-2 border-gray-300'>");
+
+        htmlOutput += createCard(`Gra: ${gameName}`, schedHTML);
+        continue;
+    }
 
+        // 🔸 Brak schedulerów → spróbuj pobrać next session
+        const nextSessionRes = await fetch(`http://localhost:8888/api/v1/authorized/schedulers/nextSession/${gameId}`);
+        const nextSessionData = await nextSessionRes.json();
+
+        if (nextSessionData.nextSession) {
+        const session = nextSessionData.nextSession;
+        const sessionHTML = `
+                    <p class="text-sm"><span class="font-semibold">Sesja:</span> ${session.sessionName}</p>
+                    <p class="text-xs text-gray-500">Godzina: ${session.startTime}</p>
+                `;
+        htmlOutput += createCard(`Gra: ${session.gameName}`, sessionHTML);
+    } else {
+        htmlOutput += createCard(`Gra: ${gameName}`, `<p class="text-sm">Umów się na następną sesję!</p>`);
+    }
+    }
+
+        contentEl.innerHTML = htmlOutput;
+
+    } catch (err) {
+        console.error("Błąd:", err);
+        renderError("Nie udało się załadować danych.");
+    }
+    });
+
+const sidebar = document.getElementById('sidebar');
+    const toggle = document.getElementById('sidebarToggle');
+
+    toggle.addEventListener('click', () => {
+        sidebar.classList.toggle('-translate-x-full');
+    });
+
+    function getToken() {
         const csrfToken = getCookie("XSRF-TOKEN");
         console.log(csrfToken)
         if (csrfToken == null) {
@@ -62,44 +263,134 @@ <h1>Witaj na swoim koncie!</h1>
             });
             return;
         }
+        return csrfToken
+    }
 
-        fetch('/api/v1/authorized/setPassword', {
-            method: 'POST',
-            headers: {
+    document.addEventListener('DOMContentLoaded', () => {
+        const csrfToken = getToken()
+        fetch('/api/v1/authorized/user', {
+            method: 'GET',
+            headers:{
                 'Content-Type': 'application/json',
-                'X-XSRF-TOKEN': getCookie("XSRF-TOKEN"),
+                'X-XSRF-TOKEN': csrfToken
             },
-            body:JSON.stringify({
-                password: password1
+            credentials: 'include'
+        })
+            .then(response => {
+                if(!response.ok) {
+                    throw new Error("Błąd podczas pobierania nazwy użytkownika");
+                }
+                return response.json();
+            })
+            .then(user => {
+                const username = document.getElementById("username")
+                if (username) {
+                    username.textContent = user.username;
+                }
             })
+
+    })
+
+
+    document.addEventListener('DOMContentLoaded', () => {
+        const notesList = document.getElementById('notes-list');
+
+        const csrfToken = getToken()
+
+        fetch('/api/v1/authorized/gameNotes', {
+            method: 'GET',
+            headers: {
+                'Content-Type': 'application/json',
+                'X-XSRF-TOKEN': csrfToken
+            },
+            credentials: 'include'
         })
-            .then(
-                Swal.fire({
-                    title: 'Proszę czekać...',
-                    didOpen: () => {
-                        Swal.showLoading()
-                    }
-                })
-            )
-            .then(response => response.json())
-            .then(data => {
-                if (data.error === 200) {
-                    Swal.fire({
-                        title: 'Sukces',
-                        text: data.message,
-                        icon: 'success',
-                        confirmButtonText: 'OK'
-                    })
-                } else {
-                    Swal.fire ({
-                        title: 'Błąd',
-                        text: data.message,
-                        icon: 'error',
-                        confirmButtonText: 'OK'
-                    });
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error('Błąd podczas pobierania notatek');
                 }
+                return response.json();
+            })
+            .then(notes => {
+                if (!notes.gameNotes || notes.gameNotes.length === 0) {
+                    notesList.innerHTML = '<li class="text-gray-500">Brak notatek do wyświetlenia.</li>';
+                    return;
+                }
+
+                notes.gameNotes.forEach(note => {
+                    const listItem = document.createElement('li');
+                    listItem.className = 'border border-light-border dark:border-dark-border rounded p-3';
+
+                    const title = document.createElement('h4');
+                    title.className = 'text-lg font-semibold';
+                    title.textContent = note.title;
+
+                    const content = document.createElement('p');
+                    content.className = 'text-sm text-light-textSecondary dark:text-dark-textSecondary mt-2';
+                    content.textContent = note.content;
+
+                    listItem.appendChild(title);
+                    listItem.appendChild(content);
+                    notesList.appendChild(listItem);
+                });
+            })
+
+                .catch(error => {
+                console.error('Wystąpił błąd:', error);
+                notesList.innerHTML = '<li class="text-red-500">Nie udało się załadować notatek.</li>';
             });
+
     });
+
+    document.addEventListener("DOMContentLoaded", function () {
+        const toggleSwitch = document.getElementById("switch-component");
+        const body = document.body;
+        const themeToggleDiv = document.querySelector(".flex.items-center.justify-center");
+        const favicon = document.getElementById("favicon");
+        function updateFavicon(theme) {
+            if (favicon) {
+                favicon.href = theme === "dark"
+                    ? "/img/logo/logo-dark.svg"
+                    : "/img/logo/logo-light.svg";
+            }
+        }
+        function applyTheme(theme) {
+            body.classList.toggle("dark", theme === "dark");
+            localStorage.setItem("theme", theme);
+            updateFavicon(theme);
+            if (toggleSwitch) toggleSwitch.checked = (theme === "dark");
+        }
+        const savedTheme = localStorage.getItem("theme") || "dark";
+        applyTheme(savedTheme);
+        if (toggleSwitch) {
+            toggleSwitch.addEventListener("change", function () {
+                const newTheme = toggleSwitch.checked ? "dark" : "light";
+                applyTheme(newTheme);
+            });
+        }
+        if (themeToggleDiv) {
+            themeToggleDiv.addEventListener("click", function (e) {
+                if (e.target.tagName === 'INPUT' || e.target.tagName === 'LABEL') return;
+                const newTheme = body.classList.contains("dark") ? "light" : "dark";
+                applyTheme(newTheme);
+            });
+        }
+    });
+
+
+
+    function getCookie(name) {
+        const cookies = document.cookie.split('; ');
+        for (let cookie of cookies) {
+            const [cookieName, cookieValue] = cookie.split('=');
+            if (cookieName === name) {
+                return decodeURIComponent(cookieValue);
+            }
+        }
+        return null;
+    }
+
+
 </script>
 <script defer src="/scripts/footer.js"></script>
 </html>