Index: src/main/resources/templates/html/admin-terms.html
===================================================================
--- src/main/resources/templates/html/admin-terms.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ src/main/resources/templates/html/admin-terms.html	(revision 743de552547f72aa36d0ace8c6df4c212d5bb86d)
@@ -8,12 +8,9 @@
     Calendar
   </title>
-  <script src="/js/cookie.js" defer></script>
   <link rel="stylesheet" href="/css/admin-terms.css">
 </head>
 <body class="light">
-<button id="authButton" style="display: none;"></button>
 <div id="content">
   <h1>Преглед и менаџирање со термини</h1>
-  <h3>Со клик врз датумот од календарот добивате преглед за термините</h3>
   <div id="left-side">
     <div id="calendar-main">
@@ -86,14 +83,13 @@
   <div id="right-side">
     <div id="active">
-      <h3>Тековни термини за ден <span id="insert-date"></span></h3> <p>(доколку постои термин, со клик врз време, се добиваат информации и овозоможува менаџирање со термин)</p>
+      <p>Тековни термини за ден <span id="insert-date"></span></p>
       <div id="frame"></div>
-      <button id="temporal-deletion" style="display: none;">Целосно бришење термин</button>
     </div>
-    <div id="summary" style="display: none;">
+    <div id="summary">
       <table id="requested-table" style="display: none;">
-        <thead><tr><th>Предложени</th></tr></thead><tbody id="requested"></tbody>
+        <thead><th>Предложени</th></thead><tbody id="requested"></tbody>
       </table>
       <table id="approved-table" style="display: none;">
-        <thead><tr><th>Одобрени</th></tr></thead><tbody id="approved"></tbody>
+        <thead><th>Одобрени</th></thead><tbody id="approved"></tbody>
       </table>
       <div id="request-assets" style="display: none;">
@@ -117,4 +113,5 @@
         </div>
       </div>
+      <button id="temporal-deletion" style="display: none;">Целосно бришење термин</button>
     </div>
   </div>
Index: src/main/resources/templates/html/admin.html
===================================================================
--- src/main/resources/templates/html/admin.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ src/main/resources/templates/html/admin.html	(revision 743de552547f72aa36d0ace8c6df4c212d5bb86d)
@@ -8,8 +8,6 @@
     <link href="https://fonts.googleapis.com/css2?family=Caveat:wght@400..700&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="/css/admin.css">
-    <script src="/js/cookie.js" defer></script>
 </head>
 <body>
-<button id="authButton" style="display: none;"></button>
 <img id="second-image" src="/images/physiotherapy.jpg">
 <div id="frame">
Index: src/main/resources/templates/html/adminCoupons.html
===================================================================
--- src/main/resources/templates/html/adminCoupons.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ src/main/resources/templates/html/adminCoupons.html	(revision 743de552547f72aa36d0ace8c6df4c212d5bb86d)
@@ -4,9 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <script src="/js/cookie.js" defer></script>
   <link rel="stylesheet" href="/css/adminNews.css">
 </head>
 <body data-page="coupons">
-<button id="authButton" style="display: none;"></button>
 <h2>Купони...</h2>
 <div class="coupons-container">
Index: src/main/resources/templates/html/adminNews.html
===================================================================
--- src/main/resources/templates/html/adminNews.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ src/main/resources/templates/html/adminNews.html	(revision 743de552547f72aa36d0ace8c6df4c212d5bb86d)
@@ -4,9 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <script src="/js/cookie.js" defer></script>
   <link rel="stylesheet" href="/css/adminNews.css">
 </head>
 <body data-page="events">
-<button id="authButton" style="display: none;"></button>
 <h2>Настани, новости...</h2>
 <div class="news-container">
Index: src/main/resources/templates/html/calendar.html
===================================================================
--- src/main/resources/templates/html/calendar.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ src/main/resources/templates/html/calendar.html	(revision 743de552547f72aa36d0ace8c6df4c212d5bb86d)
@@ -8,15 +8,13 @@
         Calendar
     </title>
-    <script src="/js/cookie.js" defer></script>
     <link rel="stylesheet" href="/css/calendar.css">
 </head>
 <body class="light">
-<button id="authButton" style="display: none;"></button>
 <div id="content">
     <div id="personal-info">
         <img id="admin-photo" src="/images/chicho-round.png">
         <div id="first-box" class="white-space">
-            <a href="editUser.html"><img src="/images/down.png">Кориснички профил</a>
-            <a href="terms.html"><img src="/images/down.png">Мои термини</a>
+            <a><img src="/images/down.png">Кориснички профил</a>
+            <a><img src="/images/down.png">Мои термини</a>
         </div>
     </div>
@@ -57,14 +55,13 @@
         </div>
         <div id="right-side">
+            <div id="hourly-terms">
+
+            </div>
             <div>
-                <label>Код на купон:</label>
-                <select id="coupon-type">
-                    <option></option>
-                </select>
+                <label>Код на купон:</label><input id="coupon-type" type="text">
             </div>
             <div>
                 <label>Медицинска состојба:</label> <input id="medical-condition" type="text">
             </div>
-            <div id="hourly-terms"></div>
             <button id="book-button" disabled>Закажи</button>
         </div>
Index: src/main/resources/templates/html/coupons.html
===================================================================
--- src/main/resources/templates/html/coupons.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ src/main/resources/templates/html/coupons.html	(revision 743de552547f72aa36d0ace8c6df4c212d5bb86d)
@@ -13,8 +13,7 @@
         }
     </style>
-    <script src="/js/cookie.js" defer></script>
 </head>
 <body>
-<button id="authButton" style="display: none;"></button>
+
 <table>
 
Index: src/main/resources/templates/html/editUser.html
===================================================================
--- src/main/resources/templates/html/editUser.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ src/main/resources/templates/html/editUser.html	(revision 743de552547f72aa36d0ace8c6df4c212d5bb86d)
@@ -4,95 +4,60 @@
     <meta charset="UTF-8">
     <title>Title</title>
-    <link rel="stylesheet" href="/css/editUser.css">
-    <script src="/js/cookie.js" defer></script>
 </head>
 <body>
-<button id="authButton" style="display: none;"></button>
-<h2>Информации за корисникот</h2>
-<div id="content">
-    <div id="main-part">
-            <div id="container">
-                <div id="left-side">
-                    <div>
-                        <p>Корисничко име</p>
-                        <input type="text" name="username" id="usernameSignIn"/>
-                    </div>
-                    <div>
-                        <p>Име</p>
-                        <input type="text" id="name" name="firstName"/>
-                    </div>
-                    <div>
-                        <p>Презиме</p>
-                        <input type="text" id="surname" name="lastName"/>
-                    </div>
-                    <div>
-                        <p>Година на раѓање</p>
-                        <input type="date" id="age" name="age"/>
-                    </div>
-                </div>
-                <div id="right-side">
-                    <div>
-                        <p>Телефон</p>
-                        <input type="tel" id="phone" placeholder="07_-___-___" name="phone"/>
-                    </div>
-                    <button id="block-account" style="display: none;">Блокирај к.сметка</button>
-                    <button id="edit-profile">Измени профил</button>
-                    <button id="saveChanges">Зачувај</button>
-                </div>
-            </div>
-        <div id="adminInfo-block" style="display: none;">
-            <table id="stat-table">
-                <thead>
-                <tr>
-                    <th>Состојба на термин</th>
-                    <th>Број</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td>Одржани термини</td>
-                    <td><span id="carried-out"></span></td>
-                </tr>
-                <tr>
-                    <td>Одбиени предлози</td>
-                    <td><span id="rejected"></span></td>
-                </tr>
-                <tr>
-                    <td>Откажани предлози</td>
-                    <td><span id="cancelledReqByUser"></span></td>
-                </tr>
-                <tr>
-                    <td>Откажани термини(корисник)</td>
-                    <td><span id="cancelledAppByUser"></span></td>
-                </tr>
-                <tr>
-                    <td>Откажани термини(админ)</td>
-                    <td><span id="cancelledAppByAdmin"></span></td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
+<div id="user-info" style="display: none;">
+    <img/>
+    <h1>Здраво <span id="cookie-name">име</span></h1>
+    <h2>Ова е твојата профилна страница. Тука имаш преглед кон твоите лични податоци, а воедно можеш и да ги модифицираш</h2>
+</div>
+<button id="edit-profile">Измени профил</button>
+<div>
+    <p>Информации за корисникот</p>
+    <div>
+        <p>Корисничко име</p>
+        <input type="text" name="username" id="usernameSignIn"/>
     </div>
-    <div id="table-part">
-        <p>Информации за термини на корисникот</p>
-        <select id="statusDropdown">
-            <option value=""></option>
-            <option value="requests" id="requests">Предложени термини</option>
-            <option value="appointments" id="appointments">Прифатени термини</option>
-            <option value="not-completed" id="not-completed">Неодржани термини</option>
-            <option value="completed" id="completed">Одржени термини</option>
-        </select>
-        <table id="additional-table">
-            <thead id="active-tableHead"></thead>
-            <tbody id="active-table"></tbody>
-        </table>
+    <div>
+        <p>Име</p>
+        <input type="text" id="name" name="firstName"/>
+    </div>
+    <div>
+        <p>Презиме</p>
+        <input type="text" id="surname" name="lastName"/>
+    </div>
+    <div>
+        <p>Телефон</p>
+        <input type="tel" id="phone" placeholder="07_-___-___" name="phone"/>
+    </div>
+    <div>
+        <p>Година на раѓање</p>
+        <input type="date" id="age" name="age"/>
     </div>
 </div>
-
+<button id="saveChanges">Зачувај</button>
+<p id="paramsDisplay"></p>
+<select id="statusDropdown">
+    <option value=""></option>
+    <option value="requests" id="requests">Предложени термини</option>
+    <option value="appointments" id="appointments">Прифатени термини</option>
+    <option value="not-completed" id="not-completed">Неодржани термини</option>
+    <option value="completed" id="completed">Одржени термини</option>
+</select>
+<table>
+    <thead id="active-tableHead"></thead>
+    <tbody id="active-table"></tbody>
+</table>
+<div id="adminInfo-block" style="display: none;">
+    <p>Број на одржани термини <span id="carried-out"></span></p>
+    <p>Број на одбиени предлози за термин <span id="rejected"></span></p>
+    <p>Број на откажани предлози за термин <span id="cancelledReqByUser"></span></p>
+    <p>Број на откажани термини(корисник) <span id="cancelledAppByUser"></span></p>
+    <p>Број на откажани термини(админ) <span id="cancelledAppByAdmin"></span></p>
+</div>
 <div id="popupModal" class="modal" style="display: none;">
     <div class="modal-content">
         <span class="close">&times;</span>
         <h2>Enter Your Details</h2>
-        <input type="text" id="userInput" required>
+        <input type="text" id="userInput" placeholder="Enter something...">
         <div class="buttons">
             <button id="cancelBtn">Cancel</button>
@@ -101,5 +66,5 @@
     </div>
 </div>
-
+<button id="block-account" style="display: none;">Блокирај к.сметка</button>
 <script type="module" src="/js/editUser.js"></script>
 </body>
Index: src/main/resources/templates/html/index.html
===================================================================
--- src/main/resources/templates/html/index.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ src/main/resources/templates/html/index.html	(revision 743de552547f72aa36d0ace8c6df4c212d5bb86d)
@@ -14,5 +14,4 @@
   <link href="https://fonts.googleapis.com/css2?family=Caveat:wght@400..700&family=Dancing+Script:wght@400..700&family=Kumbh+Sans:wght@100..900&family=Libre+Baskerville:ital,wght@0,400;0,700;1,400&family=Libre+Bodoni:ital,wght@0,400..700;1,400..700&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="/css/index.css">
-  <script src="/js/cookie.js" defer></script>
 </head>
 <body>
@@ -58,6 +57,7 @@
     </nav>
   </div>
-  <button id="authButton" style="display: none;"></button>
 </header>
+
+
 <div class="main-content">
   <div class="title">Енергијата зборува <span class="split-title">погласно од зборовите...</span></div>
@@ -80,10 +80,7 @@
     <div class="white-part">
       <p id="personalised"></p>
-      <div id="links">
-      <a href="calendar.html"><img src="/images/down.png">Закажи термин</a>
-      <a href="terms.html"><img src="/images/down.png"> Мои термини</a>
-      <a href="editUser.html"><img src="/images/down.png"> Кориснички профил</a>
-      <a href="userInfo.html"><img src="/images/down.png"> Новости и купони</a>
-      </div>
+      <a href="calendar.html">Закажи термин</a>
+      <a href="terms.html">Мои термини</a>
+      <a href="editUser.html">Кориснички профил</a>
     </div>
   </div>
@@ -156,5 +153,5 @@
         <label for="password">Лозинка:</label>
         <input type="password" id="password" name="password" required>
-        <button id="submit-btn" type="submit">Логирање</button>
+        <button type="submit">Логирање</button>
       </form>
     </div>
@@ -166,30 +163,18 @@
       <h2>Креирајте корисничка сметка</h2>
       <form class="dataForms" method="post">
-        <div>
-          <label for="name">Име:</label>
-          <input type="name" id="name" name="name" required>
-        </div>
-        <div>
-          <label for="surname">Презиме:</label>
-          <input type="surname" id="surname" name="surname" required>
-        </div>
-        <div>
-          <label for="phone">Телефон:</label>
-          <input type="tel" id="phone" name="phone" placeholder="07_-___-___" required>
-        </div>
-        <div>
-          <label for="age">Датум на раѓање:</label>
-          <input type="date" id="age" name="age" required>
-        </div>
-        <div>
-          <label for="usernameSignIn">Корисничко име:</label>
-          <input type="username" id="usernameSignIn" name="username" required>
-        </div>
-        <div>
-          <label for="passwordSignIn">Лозинка:</label>
-          <input type="password" id="passwordSignIn" name="password" required>
-        </div>
+        <label for="name">Име:</label>
+        <input type="name" id="name" name="name" required>
+        <label for="surname">Презиме:</label>
+        <input type="surname" id="surname" name="surname" required>
+        <label for="phone">Телефон:</label>
+        <input type="tel" id="phone" name="phone" placeholder="07_-___-___" required>
+        <label for="age">Датум на раѓање:</label>
+        <input type="date" id="age" name="age" required>
+        <label for="usernameSignIn">Корисничко име:</label>
+        <input type="username" id="usernameSignIn" name="username" required>
+        <label for="passwordSignIn">Лозинка:</label>
+        <input type="password" id="passwordSignIn" name="password" required>
+        <button type="submit">Креирај</button>
       </form>
-      <button id="create" type="submit">Креирај</button>
     </div>
   </div>
Index: src/main/resources/templates/html/terms.html
===================================================================
--- src/main/resources/templates/html/terms.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ src/main/resources/templates/html/terms.html	(revision 743de552547f72aa36d0ace8c6df4c212d5bb86d)
@@ -5,11 +5,14 @@
     <title>Title</title>
     <link rel="stylesheet" href="/css/terms.css">
-    <script src="/js/cookie.js" defer></script>
 </head>
 <body>
-<button id="authButton" style="display: none;"></button>
+<div id="outer-frame">
     <div id="frame">
         <div id="header">
-            <h2>Резервации</h2>
+            <div>Резервации</div>
+            <div>
+                <button>Кориснички профил</button>
+                <button>Закажи термин</button>
+            </div>
         </div>
 
@@ -22,8 +25,23 @@
 
         <table>
-            <thead id="table-head"><tr id="initial-head"></tr></thead>
-            <tbody id="requestsTableBody"></tbody>
+            <thead id="table-head">
+            <tr id="initial-head">
+<!--                <th>Термин</th>-->
+<!--                <th>Име</th>-->
+<!--                <th>Презиме</th>-->
+<!--                <th>Купон</th>-->
+<!--                <th>Дополнителни информации</th>-->
+<!--                <th>Корисник</th>-->
+<!--                <th>Откажи</th>-->
+            </tr>
+            </thead>
+            <tbody id="requestsTableBody">
+
+            </tbody>
         </table>
+
+
     </div>
+</div>
 <script src="/js/terms.js"></script>
 </body>
Index: src/main/resources/templates/html/userInfo.html
===================================================================
--- src/main/resources/templates/html/userInfo.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-  <link rel="stylesheet"  href="/css/userInfo.css">
-  <script src="/js/cookie.js" defer></script>
-</head>
-<body>
-<button id="authButton" style="display: none;"></button>
-<h2> Преглед на најнови вести и купони  </h2>
-<div id="box">
-  <div id="news">
-    <h3> Вести</h3>
-    <div id="news-frame">
-    </div>
-  </div>
-  <div id="coupons">
-    <h3>Купони </h3>
-    <div id="coupons-frame">
-    </div>
-  </div>
-</div>
-<script src="/js/userInfo.js"></script>
-</body>
-</html>
Index: src/main/resources/templates/html/users-view.html
===================================================================
--- src/main/resources/templates/html/users-view.html	(revision 43c909087ac1cb1edc0060980e76744ba06a74bf)
+++ src/main/resources/templates/html/users-view.html	(revision 743de552547f72aa36d0ace8c6df4c212d5bb86d)
@@ -5,8 +5,6 @@
   <title>Title</title>
   <link rel="stylesheet" href="/css/users-view.css">
-  <script src="/js/cookie.js" defer></script>
 </head>
 <body>
-<button id="authButton" style="display: none;"></button>
 <div id="frame">
   <div id="header-part">
