diff --git a/html/assets/css/bootstrap-grid.min.css b/html/assets/css/vendor/bootstrap-grid.min.css
similarity index 100%
rename from html/assets/css/bootstrap-grid.min.css
rename to html/assets/css/vendor/bootstrap-grid.min.css
diff --git a/html/assets/css/bootstrap-grid.min.css.map b/html/assets/css/vendor/bootstrap-grid.min.css.map
similarity index 100%
rename from html/assets/css/bootstrap-grid.min.css.map
rename to html/assets/css/vendor/bootstrap-grid.min.css.map
diff --git a/html/assets/css/bootstrap-reboot.min.css b/html/assets/css/vendor/bootstrap-reboot.min.css
similarity index 100%
rename from html/assets/css/bootstrap-reboot.min.css
rename to html/assets/css/vendor/bootstrap-reboot.min.css
diff --git a/html/assets/css/bootstrap-reboot.min.css.map b/html/assets/css/vendor/bootstrap-reboot.min.css.map
similarity index 100%
rename from html/assets/css/bootstrap-reboot.min.css.map
rename to html/assets/css/vendor/bootstrap-reboot.min.css.map
diff --git a/html/assets/css/bootstrap.min.css b/html/assets/css/vendor/bootstrap.min.css
similarity index 100%
rename from html/assets/css/bootstrap.min.css
rename to html/assets/css/vendor/bootstrap.min.css
diff --git a/html/assets/css/bootstrap.min.css.map b/html/assets/css/vendor/bootstrap.min.css.map
similarity index 100%
rename from html/assets/css/bootstrap.min.css.map
rename to html/assets/css/vendor/bootstrap.min.css.map
diff --git a/html/assets/js/api.js b/html/assets/js/api.js
index a7a5505..d872885 100644
--- a/html/assets/js/api.js
+++ b/html/assets/js/api.js
@@ -90,6 +90,13 @@ window.ctf01d_tp_api.service_info = function(service_id) {
     });
 }
 
+window.ctf01d_tp_api.teams_list = function () {
+    return $.ajax({
+        url: '/api/v1/teams',
+        method: 'GET',
+    });
+}
+
 window.ctf01d_tp_api.users_list = function (user_data) {
     return $.ajax({
         url: '/api/v1/users',
diff --git a/html/assets/js/index.js b/html/assets/js/index.js
index b323f9e..3747328 100644
--- a/html/assets/js/index.js
+++ b/html/assets/js/index.js
@@ -121,27 +121,27 @@ function gameCreate() {
 function showLoginForm() {
     $('#sign_error_info').html('')
     $('#sign_error_info').css({"display": "none"});
-    $('#signin_username').focus();
-    $('#signin_username').unbind();
-    $('#signin_username').keypress(function (e) {
+    $('#sign_in_username').focus();
+    $('#sign_in_username').unbind();
+    $('#sign_in_username').keypress(function (e) {
         if (e.which == 13) {
-            $('#signin_password').focus();
+            $('#sign_in_password').focus();
             return false; // <---- Add this line
         }
     });
-    $('#signin_password').unbind();
-    $('#signin_password').keypress(function (e) {
+    $('#sign_in_password').unbind();
+    $('#sign_in_password').keypress(function (e) {
         if (e.which == 13) {
             doSignIn();
             return false; // <---- Add this line
         }
     });
-    $('#modal_signin').modal('show');
+    $('#modal_sign_in').modal('show');
 }
 
 function doSignIn() {
-    var username = $('#signin_username').val();
-    var password = $('#signin_password').val();
+    var username = $('#sign_in_username').val();
+    var password = $('#sign_in_password').val();
     $('#sign_error_info').html('')
     $('#sign_error_info').css({"display": "none"});
     window.ctf01d_tp_api.auth_signin({
@@ -154,7 +154,7 @@ function doSignIn() {
     }).done(function(res) {
         console.log(res);
         showSuccessNotification('Login successful!');
-        $('#modal_signin').modal('hide');
+        $('#modal_sign_in').modal('hide');
         setTimeout(function () {
             window.location.reload();
         }, 1000);
@@ -359,25 +359,102 @@ function renderServicesPage() {
     })
 }
 
+function showCreateUser() {
+    $('#users_page_error').css({ "display": "none" });
+    $('#users_page_error').html("");
+
+    $('#user_update_user_id').val(0);
+    $('#user_create_name').val("");
+    $('#user_create_display_name').val("");
+    $('#user_create_avatar_url').val("");
+    $('#user_create_password').val("");
+    $('#user_create_status').val("");
+    $('#user_create_role').val("guest");
+    $('#user_create_team').empty(); // Clear teams
+
+    loadTeams(); // Load teams into the select element
+
+    $('#btn_user_create_or_update').html("Create");
+    $('#title_user_create_or_update').html("New User");
+    $('#modal_edit_or_create_user').modal('show');
+}
+
+function loadTeams() {
+    window.ctf01d_tp_api.teams_list().done(function (teams) {
+        var teamSelect = $('#user_create_team');
+        teams.forEach(function (team) {
+            teamSelect.append(`<option value="${team.id}">${team.name}</option>`);
+        });
+    }).fail(function () {
+        alert('Error loading teams');
+    });
+}
+
+function userCreateOrUpdate() {
+    $('#users_page_error').css({ "display": "none" });
+    $('#users_page_error').html("");
+
+    var user_id = $('#user_update_user_id').val();
+
+    var userName = $('#user_create_name').val();
+    var userDisplayName = $('#user_create_display_name').val();
+    var userAvatarUrl = $('#user_create_avatar_url').val();
+    var userPassword = $('#user_create_password').val();
+    var userStatus = $('#user_create_status').val();
+    var userRole = $('#user_create_role').val();
+    var userTeams = $('#user_create_team').val().map(function (id) {
+        return id;
+    });
+
+    var userData = {
+        user_name: userName,
+        display_name: userDisplayName,
+        avatar_url: userAvatarUrl,
+        password: userPassword,
+        status: userStatus,
+        role: userRole,
+        team_ids: userTeams
+    };
+
+    if (user_id == 0) {
+        window.ctf01d_tp_api.user_create(userData).fail(function (res) {
+            $('#users_page_error').css({ "display": "block" });
+            $('#users_page_error').html("Error creating user");
+            console.error(res);
+        }).done(function (res) {
+            $('#modal_edit_or_create_user').modal('hide');
+            showSuccessNotification('User created successfully!');
+            renderUsersPage();
+        });
+    } else {
+        window.ctf01d_tp_api.user_update(user_id, userData).fail(function (res) {
+            $('#users_page_error').css({ "display": "block" });
+            $('#users_page_error').html("Error updating user");
+            console.error(res);
+        }).done(function (res) {
+            $('#modal_edit_or_create_user').modal('hide');
+            showSuccessNotification('User updated successfully!');
+            renderUsersPage();
+        });
+    }
+}
+
 function renderUsersPage() {
-    $('.spa-web-page').css({ "display": "" })
-    $('#users_page').css({ "display": "block" })
+    $('.spa-web-page').css({ "display": "" });
+    $('#users_page').css({ "display": "block" });
     $('#users_page_error').css({ "display": "none" });
     $('#users_page_error').html("");
     if (window.location.pathname != "/users/") {
         window.location.href = "/users/";
     }
     window.ctf01d_tp_api.users_list().fail(function (res) {
-        $('#users_page_error').css({
-            "display": "block"
-        });
+        $('#users_page_error').css({ "display": "block" });
         $('#users_page_error').html("Error loading users");
         console.error("users_list", res);
     }).done(function (res) {
         var usersHtml = ""
         for (var i in res) {
             var user_info = res[i];
-            console.log("user_info", user_info);
             usersHtml += '<div class="card services-card" style="width: 20rem;">';
             usersHtml += '  <img class="users-card-avatar" src="' + user_info.avatar_url + '" alt="Image of user">';
             usersHtml += '  <div class="card-body">';
@@ -387,14 +464,14 @@ function renderUsersPage() {
             usersHtml += '    <p class="card-text"> state ' + escapeHtml(user_info.status) + '</p>';
             usersHtml += '  </div>';
             usersHtml += '  <div class="card-body">';
-            usersHtml += '    <button class="btn btn-secondary" onclick="showProfileUser(\'' + user_info.id + '\');">Profile</button>';
+            usersHtml += '    <button class="btn btn-secondary" onclick="showMyTeams(\'' + user_info.id + '\');">Profile</button>';
             usersHtml += '    <button class="btn btn-primary" onclick="showUpdateUser(\'' + user_info.id + '\');">Update</button>';
             usersHtml += '    <button class="btn btn-danger" onclick="deleteUser(\'' + user_info.id + '\');">Delete</button>';
             usersHtml += '  </div>';
             usersHtml += '</div>';
         }
         $('#users_page_list').html(usersHtml);
-    })
+    });
 }
 
 function renderPage(pathname) {
@@ -423,6 +500,28 @@ function renderPage(pathname) {
     }
 }
 
+function showMyTeams(userId) {
+    window.ctf01d_tp_api.user_profile(userId).fail(function (res) {
+        $('#my_teams_content').html('<div class="alert alert-danger">Fail to fetch profile</div>');
+        $('#modal_my_teams').modal('show');
+        console.error("profile", res);
+    }).done(function (data) {
+        var teamHistoryHtml = '<div class="team-history">';
+        for (var i in data.team_history) {
+            var team = data.team_history[i];
+            teamHistoryHtml += '<div class="team">';
+            teamHistoryHtml += '<div class="team-name">' + team.name + '</div>';
+            teamHistoryHtml += '<div class="team-dates">Joined at: ' + new Date(team.join).toLocaleString() +
+                (team.left ? ', Left at: ' + new Date(team.left).toLocaleString() : ', ... ') + '</div>';
+            teamHistoryHtml += '</div>';
+        }
+        teamHistoryHtml += '</div>';
+        var currentTeamHtml = '<div class="current-team"><strong>Current Team: </strong>' + data.team_name + '</div>';
+        $('#my_teams_content').html(currentTeamHtml + teamHistoryHtml);
+        $('#modal_my_teams').modal('show');
+    });
+}
+
 
 $(document).ready(function () {
     console.log("Ready")
diff --git a/html/assets/js/bootstrap-notify.min.js b/html/assets/js/vendor/bootstrap-notify.min.js
similarity index 100%
rename from html/assets/js/bootstrap-notify.min.js
rename to html/assets/js/vendor/bootstrap-notify.min.js
diff --git a/html/assets/js/bootstrap.min.js b/html/assets/js/vendor/bootstrap.min.js
similarity index 100%
rename from html/assets/js/bootstrap.min.js
rename to html/assets/js/vendor/bootstrap.min.js
diff --git a/html/assets/js/bootstrap.min.js.map b/html/assets/js/vendor/bootstrap.min.js.map
similarity index 100%
rename from html/assets/js/bootstrap.min.js.map
rename to html/assets/js/vendor/bootstrap.min.js.map
diff --git a/html/assets/js/jquery-3.7.1.min.js b/html/assets/js/vendor/jquery-3.7.1.min.js
similarity index 100%
rename from html/assets/js/jquery-3.7.1.min.js
rename to html/assets/js/vendor/jquery-3.7.1.min.js
diff --git a/html/assets/js/jquery-3.7.1.min.map b/html/assets/js/vendor/jquery-3.7.1.min.map
similarity index 100%
rename from html/assets/js/jquery-3.7.1.min.map
rename to html/assets/js/vendor/jquery-3.7.1.min.map
diff --git a/html/assets/js/popper.min.js b/html/assets/js/vendor/popper.min.js
similarity index 100%
rename from html/assets/js/popper.min.js
rename to html/assets/js/vendor/popper.min.js
diff --git a/html/assets/js/tooltip.min.js b/html/assets/js/vendor/tooltip.min.js
similarity index 100%
rename from html/assets/js/tooltip.min.js
rename to html/assets/js/vendor/tooltip.min.js
diff --git a/html/index.html b/html/index.html
index 56c4012..82b49b1 100644
--- a/html/index.html
+++ b/html/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <title>ctf01d training platform</title>
@@ -6,17 +7,17 @@
     <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
     <base href="/">
 
-    <link href="./assets/css/bootstrap.min.css?v=1.0" rel="stylesheet" type='text/css' />
+    <link href="./assets/css/vendor/bootstrap.min.css?v=1.0" rel="stylesheet" type='text/css' />
     <link href="./assets/css/index.css?v=1.0" rel="stylesheet" type='text/css' />
 
-    <script src="./assets/js/jquery-3.7.1.min.js?v=1.1"></script>
-    <script src="./assets/js/tooltip.min.js?v=1.1"></script>
-    <script src="./assets/js/popper.min.js?v=1.1"></script>
-    <script src="./assets/js/bootstrap.min.js?v=1.0"></script>
-    <script src="./assets/js/bootstrap-notify.min.js?v=1.0"></script>
+    <script src="./assets/js/vendor/jquery-3.7.1.min.js?v=1.1"></script>
+    <script src="./assets/js/vendor/tooltip.min.js?v=1.1"></script>
+    <script src="./assets/js/vendor/popper.min.js?v=1.1"></script>
+    <script src="./assets/js/vendor/bootstrap.min.js?v=1.0"></script>
+    <script src="./assets/js/vendor/bootstrap-notify.min.js?v=1.0"></script>
     <script src="./assets/js/api.js?v=1.0"></script>
     <script src="./assets/js/index.js?v=1.0"></script>
-</head>
+  </head>
   <body>
     <!-- MENU_BEGIN -->
     <nav class="navbar navbar-expand-lg navbar-light bg-light" id="menu_global">
@@ -47,7 +48,7 @@
               User
             </a>
             <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-              <div class="dropdown-item" id="btn_my_teams" onclick="showMyTeams()">My Team(s)</div>
+              <div class="dropdown-item" id="btn_my_teams" onclick="showMyTeams('2d10ba59-4e45-4b05-86e4-9a135b444c50')">My Team(s)</div> <!-- fixme use id from session -->
               <div class="dropdown-item" id="btn_my_services" onclick="showMyServices()">My Service(s)</div>
               <div class="dropdown-divider"></div>
               <div class="dropdown-item" id="btn_sign_out" onclick="doSignOut()">Sign-out</div>
@@ -58,7 +59,8 @@
     </nav>
     <!-- MENU_END -->
 
-    <div class="modal fade" id="modal_signin" tabindex="-1" role="dialog" aria-hidden="true">
+    <!-- MODAL_SIGN_IN -->
+    <div class="modal fade" id="modal_sign_in" tabindex="-1" role="dialog" aria-hidden="true">
       <div class="modal-dialog" role="document">
         <div class="modal-content">
           <div class="modal-header">
@@ -70,12 +72,12 @@ <h5 class="modal-title" id="exampleModalLongTitle">Sign-in</h5>
           <div class="modal-body">
             <form>
               <div class="form-group">
-                <!-- label for="signin_username" class="col-form-label">Username:</label-->
-                <input type="text" class="form-control" id="signin_username" placeholder="Username" required>
+                <!-- label for="sign_in_username" class="col-form-label">Username:</label-->
+                <input type="text" class="form-control" id="sign_in_username" placeholder="Username" required>
               </div>
               <div class="form-group">
-                <!-- label for="signin_password" class="col-form-label">Password:</label -->
-                <input type="password" class="form-control" id="signin_password" placeholder="Password" required>
+                <!-- label for="sign_in_password" class="col-form-label">Password:</label -->
+                <input type="password" class="form-control" id="sign_in_password" placeholder="Password" required>
               </div>
             </form>
             <div class="alert alert-danger" role="alert" style="display: none;" id="sign_error_info">
@@ -83,12 +85,36 @@ <h5 class="modal-title" id="exampleModalLongTitle">Sign-in</h5>
             </div>
           </div>
           <div class="modal-footer">
-            <button type="button" class="btn btn-primary" onclick="doSignin()">Sign-in</button>
+            <button type="button" class="btn btn-primary" onclick="doSignIn()">Sign-in</button>
             <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
           </div>
         </div>
       </div>
     </div>
+    <!-- MODAL_SIGN_IN_END -->
+
+    <!-- MY TEAMS MODAL -->
+    <div class="modal fade" id="modal_my_teams" tabindex="-1" role="dialog" aria-hidden="true">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title" id="exampleModalLongTitle">My teams</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <div class="modal-body">
+            <div id="my_teams_content">
+              <!-- Team history content will be inserted here -->
+            </div>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- MY TEAMS MODAL END -->
 
     <!-- WELCOME PAGE -->
     <div class="container spa-web-page" id="root_page">
@@ -99,8 +125,8 @@ <h5 class="modal-title" id="exampleModalLongTitle">Sign-in</h5>
         </div>
         <div class="card-body">
           <div class="card-text">
-            <p>This service can prapare training attack-defence game, based on ctf01d jury system</p>
-            <p>Guthub: <a href="https://github.com/sea-kg/ctf01d-training-platform">https://github.com/sea-kg/ctf01d-training-platform</a></p>
+            <p>This service can prepare training attack-defense game, based on ctf01d jury system</p>
+            <p>Github: <a href="https://github.com/sea-kg/ctf01d-training-platform">https://github.com/sea-kg/ctf01d-training-platform</a></p>
           </div>
         </div>
       </div>
@@ -245,6 +271,66 @@ <h2>Users</h2>
       </div>
       <br>
     </div>
+    <div class="modal fade" id="modal_edit_or_create_user" tabindex="-1" role="dialog" aria-hidden="true">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title" id="title_user_create_or_update">New User</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <div class="modal-body">
+            <form id="add-user-form">
+              <input type="hidden" id="user_update_user_id" value="0" name="user_id">
+              <div class="form-group">
+                <label for="user_create_name" class="col-form-label">Username:</label>
+                <input type="text" class="form-control" id="user_create_name" name="user_name" placeholder="Username"
+                  required>
+              </div>
+              <div class="form-group">
+                <label for="user_create_display_name" class="col-form-label">Display Name:</label>
+                <input type="text" class="form-control" id="user_create_display_name" name="display_name"
+                  placeholder="Display Name">
+              </div>
+              <div class="form-group">
+                <label for="user_create_avatar_url" class="col-form-label">Avatar URL:</label>
+                <input type="text" class="form-control" id="user_create_avatar_url" name="avatar_url"
+                  placeholder="Avatar URL">
+              </div>
+              <div class="form-group">
+                <label for="user_create_password" class="col-form-label">Password:</label>
+                <input type="password" class="form-control" id="user_create_password" name="password" placeholder="Password"
+                  required>
+              </div>
+              <div class="form-group">
+                <label for="user_create_status" class="col-form-label">Status:</label>
+                <input type="text" class="form-control" id="user_create_status" name="status" placeholder="Status">
+              </div>
+              <div class="form-group">
+                <label for="user_create_role" class="col-form-label">Role:</label>
+                <select class="form-control" id="user_create_role" name="role">
+                  <option value="admin">Admin</option>
+                  <option value="player">Player</option>
+                  <option value="guest">Guest</option>
+                </select>
+              </div>
+              <div class="form-group">
+                <label for="user_create_team" class="col-form-label">Team:</label>
+                <select class="form-control" id="user_create_team" name="team" multiple>
+                  <!-- Teams will be loaded here -->
+                </select>
+              </div>
+            </form>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+            <button type="button" class="btn btn-primary" id="btn_user_create_or_update"
+              onclick="userCreateOrUpdate()">Create</button>
+          </div>
+        </div>
+      </div>
+    </div>
 
     <!-- UNKNOWN PAGE -->
     <div class="container spa-web-page" id="unknown_page">
diff --git a/html/templates/services/index.html b/html/templates/services/index.html
deleted file mode 100644
index d6494ec..0000000
--- a/html/templates/services/index.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <title>Main Page</title>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            margin: 0;
-            padding: 0;
-        }
-
-        .container {
-            display: flex;
-        }
-
-        .sidebar {
-            width: 60%;
-            background: #f3f3f3;
-            padding: 20px;
-            height: 100vh;
-            overflow-y: auto;
-        }
-
-        .content {
-            width: 40%;
-            padding: 20px;
-        }
-
-        input {
-            display: block;
-            width: 50%;
-            padding: 10px;
-            margin: 10px 0;
-        }
-
-        select {
-            display: block;
-            width: 50%;
-            padding: 10px;
-            margin: 10px 0;
-        }
-
-        button {
-            cursor: pointer;
-        }
-
-        .navigation {
-            margin-bottom: 20px;
-        }
-
-        a {
-            margin-right: 20px;
-            text-decoration: none;
-            color: blue;
-        }
-
-        a:hover {
-            text-decoration: underline;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="container">
-        <div class="sidebar">
-            <h2>Services</h2>
-            <div id="service-list">
-                <!-- Service list will be loaded here -->
-            </div>
-        </div>
-        <div class="content">
-            <div class="navigation">
-                <a href="/games/index.html">List Games</a>
-                <a href="/services/index.html">List Users</a>
-                <a href="/teams/index.html">List Teams</a>
-                <a href="/services/index.html">List Services</a>
-            </div>
-            <h2 id="service-label">Add New Service</h2>
-            <form id="add-service-form">
-                <input type="hidden" id="service_id" name="service_id">
-                <input type="text" id="name" name="name" placeholder="Name" required>
-                <input type="text" id="author" name="author" placeholder="Author" required>
-                <input type="text" id="logo_url" name="logo_url" placeholder="Logo URL" required>
-                <textarea id="description" name="description" placeholder="Description" required></textarea>
-                <input type="checkbox" id="is_public" name="is_public"> Is Public<br>
-                <button type="submit">Add Service</button>
-            </form>
-        </div>
-    </div>
-
-    <script>
-        $(document).ready(function () {
-            function loadServices() {
-                $.ajax({
-                    url: '/api/services',
-                    method: 'GET',
-                    success: function (services) {
-                        $('#service-list').empty();
-                        services.forEach(function (service) {
-                            var serviceInfoDiv = $('<div>').append(
-                                $('<img>').attr({
-                                    src: service.avatar_url,
-                                    alt: "Service Avatar",
-                                    style: "width:50px;height:50px;"
-                                }),
-
-                                $('<p>').text('Nick: ').append($('<a>').text(service.name).click(function () {
-                                    $('#name').val(service.name);
-                                    $('#author').val(service.author);
-                                    $('#logo_url').val(service.logo_url);
-                                    $('#description').val(service.description);
-                                    $('#is_public').prop('checked', service.is_public);
-                                    $('button[type=submit]').text('Update Service');
-                                    $('#service-label').text('Update Service');
-                                })),
-                                $('<p>').text(`Role: ${service.role}`),
-                                $('<p>').text(`Status: ${service.status}`),
-                                $('<button>').text('Delete').click(function () {
-                                    deleteService(service.id);
-                                })
-                            );
-                            $('#service-list').append(serviceInfoDiv);
-                        });
-                    }
-                });
-            }
-            function loadTeams() {
-                $.ajax({
-                    url: '/api/teams',
-                    method: 'GET',
-                    success: function (teams) {
-                        var teamSelect = $('#team');
-                        teamSelect.empty();
-                        teams.forEach(function (team) {
-                            teamSelect.append(`<option value="${team.id}">${team.name}</option>`);
-                        });
-                    },
-                    error: function () {
-                        alert('Error loading teams');
-                    }
-                });
-            }
-            function deleteService(serviceId) {
-                $.ajax({
-                    url: `/api/services/${serviceId}`,
-                    method: 'DELETE',
-                    success: function () {
-                        alert('Service deleted successfully!');
-                        loadServices();
-                    },
-                    error: function () {
-                        alert('Error deleting service');
-                    }
-                });
-            }
-            loadServices();
-            loadTeams();
-            $('#add-service-form').on('submit', function (e) {
-                e.preventDefault();
-                var serviceId = $('#service_id').val();
-                var methodType = serviceId ? 'PUT' : 'POST';
-                var apiUrl = serviceId ? `/api/services/${serviceId}` : '/api/services';
-                var data = {
-                    name: $('#name').val(),
-                    author: $('#author').val(),
-                    logo_url: $('#logo_url').val(),
-                    description: $('#description').val(),
-                    is_public: $('#is_public').prop('checked')
-                };
-
-                $.ajax({
-                    url: apiUrl,
-                    method: methodType,
-                    contentType: 'application/json',
-                    data: JSON.stringify(data),
-                    success: function (response) {
-                        alert('Service added/updated successfully!');
-                        loadServices();
-                        $('#add-service-form').trigger("reset");
-                        $('#service-label').text('Add Service');
-                        $('button[type=submit]').text('Add Service');
-                    },
-                    error: function () {
-                        alert('Error adding/updating service');
-                    }
-                });
-            });
-        });
-    </script>
-</body>
-
-</html>
diff --git a/html/templates/teams/index.html b/html/templates/teams/index.html
deleted file mode 100644
index aa47a84..0000000
--- a/html/templates/teams/index.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <title>Main Page</title>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-    <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
-    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            margin: 0;
-            padding: 0;
-        }
-
-        .container {
-            display: flex;
-        }
-
-        .sidebar {
-            width: 60%;
-            background: #f3f3f3;
-            padding: 20px;
-            height: 100vh;
-            overflow-y: auto;
-        }
-
-        .content {
-            width: 40%;
-            padding: 20px;
-        }
-
-        input {
-            display: block;
-            width: 50%;
-            padding: 10px;
-            margin: 10px 0;
-        }
-
-        button {
-            cursor: pointer;
-        }
-
-        .navigation {
-            margin-bottom: 20px;
-        }
-
-        a {
-            margin-right: 20px;
-            text-decoration: none;
-            color: blue;
-        }
-
-        a:hover {
-            text-decoration: underline;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="container">
-        <div class="sidebar">
-            <h2>Teams</h2>
-            <div id="team-list">
-                <!-- Team list will be loaded here -->
-            </div>
-        </div>
-        <div class="content">
-            <div class="navigation">
-                <a href="/games/index.html">List Games</a>
-                <a href="/users/index.html">List Users</a>
-                <a href="/teams/index.html">List Teams</a>
-                <a href="/services/index.html">List Services</a>
-            </div>
-            <h2 id="user-label">Add New Team</h2>
-            <form id="add-team-form">
-                <input type="hidden" id="team_id" name="team_id">
-                <input type="text" id="name" name="name" placeholder="Team name" required>
-                <input type="text" id="description" name="Description" placeholder="Description">
-                <input type="text" id="social_links" name="Social links" placeholder="Social links">
-                <input type="text" id="avatar_url" name="Avatar URL" placeholder="Avatar URL">
-                <input type="text" id="university" name="University" placeholder="University">
-                <input type="hidden" id="university_id" name="university_id">
-
-                <button type="submit">Add Team</button>
-            </form>
-        </div>
-    </div>
-
-    <script>
-        function deleteTeam(teamId) {
-            $.ajax({
-                url: `/api/teams/${teamId}`,
-                method: 'DELETE',
-                success: function () {
-                    alert('Team deleted successfully!');
-                    loadTeams();
-                },
-                error: function () {
-                    alert('Error deleting team');
-                }
-            });
-        }
-        function loadTeams() {
-            $.ajax({
-                url: '/api/teams',
-                method: 'GET',
-                success: function (teams) {
-                    $('#team-list').empty();
-                    teams.forEach(function (team) {
-                        var teamInfoDiv = $('<div>').append(
-                            $('<img>').attr({
-                                src: team.avatar_url,
-                                alt: "Team Avatar",
-                                style: "width:50px;height:50px;"
-                            }),
-                            $('<p>').text('Name: ').append($('<a>').text(team.name).click(function () {
-                                $('#name').val(team.name);
-                                $('#avatar_url').val(team.avatar_url);
-                                $('#team_id').val(team.id);
-                                $('#description').val(team.description);
-                                $('#social_links').val(team.social_links);
-                                $('button[type=submit]').text('Update Team');
-                                $('#user-label').text('Update Team');
-                            })),
-                            $('<p>').text(`Description: ${team.description}`),
-                            $('<p>').text(`University: ${team.university}`),
-                            $('<button>').text('Delete').click(function () {
-                                deleteTeam(team.id);
-                            })
-                        );
-                        $('#team-list').append(teamInfoDiv);
-                    });
-                }
-            });
-        }
-        $(document).ready(function () {
-            loadTeams();
-            $('#university').autocomplete({
-                source: function (request, response) {
-                    $.ajax({
-                        url: '/api/universities',
-                        dataType: 'json',
-                        data: {
-                            term: request.term
-                        },
-                        success: function (data) {
-                            response($.map(data, function (item) {
-                                return {
-                                    label: item.name,
-                                    value: item.name,
-                                    id: item.id
-                                };
-                            }));
-                        }
-                    });
-                },
-                minLength: 2,
-                select: function (event, ui) {
-                    console.log("Selected: " + ui.item.label + ", ID: " + ui.item.id);
-                    $('#university').val(ui.item.label);
-                    $('#university_id').val(ui.item.id);
-                    return false;
-                }
-            });
-            $('#add-team-form').on('submit', function (e) {
-                e.preventDefault();
-                var teamId = $('#team_id').val();
-                var methodType = teamId ? 'PUT' : 'POST';
-                var apiUrl = teamId ? `/api/teams/${teamId}` : '/api/teams';
-                var data = {
-                    name: $('#name').val(),
-                    description: $('#description').val(),
-                    social_links: $('#social_links').val(),
-                    avatar_url: $('#avatar_url').val(),
-                    university_id: parseInt($('#university_id').val(), 10)
-                };
-                $.ajax({
-                    url: apiUrl,
-                    method: methodType,
-                    contentType: 'application/json',
-                    data: JSON.stringify(data),
-                    success: function (response) {
-                        alert('Team added/updated successfully!');
-                        loadTeams();
-                        $('#add-team-form').trigger("reset");
-                        $('#team-label').text('Add Team');
-                        $('button[type=submit]').text('Add Team');
-                    },
-                    error: function () {
-                        alert('Error adding/updating team');
-                    }
-                });
-            });
-        });
-    </script>
-</body>
-
-</html>
diff --git a/html/templates/users/index.html b/html/templates/users/index.html
deleted file mode 100644
index b1c0375..0000000
--- a/html/templates/users/index.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <title>Main Page</title>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            margin: 0;
-            padding: 0;
-        }
-
-        .container {
-            display: flex;
-        }
-
-        .sidebar {
-            width: 60%;
-            background: #f3f3f3;
-            padding: 20px;
-            height: 100vh;
-            overflow-y: auto;
-        }
-
-        .content {
-            width: 40%;
-            padding: 20px;
-        }
-
-        input {
-            display: block;
-            width: 50%;
-            padding: 10px;
-            margin: 10px 0;
-        }
-
-        select {
-            display: block;
-            width: 50%;
-            padding: 10px;
-            margin: 10px 0;
-        }
-
-        button {
-            cursor: pointer;
-        }
-
-        .navigation {
-            margin-bottom: 20px;
-        }
-
-        a {
-            margin-right: 20px;
-            text-decoration: none;
-            color: blue;
-        }
-
-        a:hover {
-            text-decoration: underline;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="container">
-        <div class="sidebar">
-            <h2>Users</h2>
-            <div id="user-list">
-                <!-- User list will be loaded here -->
-            </div>
-        </div>
-        <div class="content">
-            <div class="navigation">
-                <a href="/games/index.html">List Games</a>
-                <a href="/users/index.html">List Users</a>
-                <a href="/teams/index.html">List Teams</a>
-                <a href="/servises/index.html">List Services</a>
-            </div>
-            <h2 id="user-label">Add New User</h2>
-            <form id="add-user-form">
-                <input type="hidden" id="user_id" name="user_id">
-                <input type="text" id="user_name" name="user_name" placeholder="Username" required>
-                <select id="team" name="team" multiple>
-                </select>
-                <input type="password" id="password" name="password" placeholder="Password" required>
-                <input type="text" id="status" name="status" placeholder="Status">
-                <input type="text" id="avatar_url" name="avatar_url" placeholder="Avatar URL">
-                <select id="role" name="role">
-                    <option value="admin">Admin</option>
-                    <option value="player">Player</option>
-                    <option value="player">Guest</option>
-                </select>
-                <button type="submit">Add User</button>
-            </form>
-        </div>
-    </div>
-
-    <script>
-        $(document).ready(function () {
-            function loadUsers() {
-                $.ajax({
-                    url: '/api/users',
-                    method: 'GET',
-                    success: function (users) {
-                        $('#user-list').empty();
-                        users.forEach(function (user) {
-                            var userInfoDiv = $('<div>').append(
-                                $('<img>').attr({
-                                    src: user.avatar_url,
-                                    alt: "User Avatar",
-                                    style: "width:50px;height:50px;"
-                                }),
-                                $('<p>').text('Nick: ').append($('<a>').text(user.user_name).click(function () {
-                                    $('#user_name').val(user.user_name);
-                                    $('#password').val('');
-                                    $('#avatar_url').val(user.avatar_url);
-                                    $('#status').val(user.status);
-                                    $('#role').val(user.role);
-                                    $('#user_id').val(user.id);
-                                    $('button[type=submit]').text('Update User');
-                                    $('#user-label').text('Update User');
-                                })),
-                                $('<p>').text(`Role: ${user.role}`),
-                                $('<p>').text(`Status: ${user.status}`),
-                                $('<button>').text('Delete').click(function () {
-                                    deleteUser(user.id);
-                                })
-                            );
-                            $('#user-list').append(userInfoDiv);
-                        });
-                    }
-                });
-            }
-            function loadTeams() {
-                $.ajax({
-                    url: '/api/teams',
-                    method: 'GET',
-                    success: function (teams) {
-                        var teamSelect = $('#team');
-                        teamSelect.empty();
-                        teams.forEach(function (team) {
-                            teamSelect.append(`<option value="${team.id}">${team.name}</option>`);
-                        });
-                    },
-                    error: function () {
-                        alert('Error loading teams');
-                    }
-                });
-            }
-            function deleteUser(userId) {
-                $.ajax({
-                    url: `/api/users/${userId}`,
-                    method: 'DELETE',
-                    success: function () {
-                        alert('User deleted successfully!');
-                        loadUsers();
-                    },
-                    error: function () {
-                        alert('Error deleting user');
-                    }
-                });
-            }
-            loadUsers();
-            loadTeams();
-            $('#add-user-form').on('submit', function (e) {
-                e.preventDefault();
-                var userId = $('#user_id').val();
-                var methodType = userId ? 'PUT' : 'POST';
-                var apiUrl = userId ? `/api/users/${userId}` : '/api/users';
-                var data = {
-                    user_name: $('#user_name').val(),
-                    password: $('#password').val(),
-                    avatar_url: $('#avatar_url').val(),
-                    status: $('#status').val(),
-                    role: $('#role').val(),
-                    team_ids: $('#team').val().map(function (id) {
-                        return parseInt(id, 10);
-                    })
-                };
-
-                $.ajax({
-                    url: apiUrl,
-                    method: methodType,
-                    contentType: 'application/json',
-                    data: JSON.stringify(data),
-                    success: function (response) {
-                        alert('User added/updated successfully!');
-                        loadUsers();
-                        $('#add-user-form').trigger("reset");
-                        $('#user-label').text('Add User');
-                        $('button[type=submit]').text('Add User');
-                    },
-                    error: function () {
-                        alert('Error adding/updating user');
-                    }
-                });
-            });
-        });
-    </script>
-</body>
-
-</html>