Index: src/main/resources/templates/access_denied.html
===================================================================
--- src/main/resources/templates/access_denied.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/access_denied.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,11 +1,10 @@
-<div class="container py-5">
-  <div class="row">
-    <div class="col-md-2 text-center">
-      <p><i class="fa fa-exclamation-triangle fa-5x"></i><br/>Status Code: 403</p>
-    </div>
-    <div class="col-md-10">
-      <p>Sorry, your access is refused.<br/>Please go back to the previous page to continue browsing.</p>
-      <a class="btn btn-danger" href="javascript:history.back()">Go Back</a>
-    </div>
-  </div>
-</div>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
Index: src/main/resources/templates/add_product.html
===================================================================
--- src/main/resources/templates/add_product.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/add_product.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,86 +1,10 @@
-<th:block xmlns:th="http://www.thymeleaf.org">
-  <section class="jumbotron text-center">
-    <div class="container">
-      <h1 class="jumbotron-heading">FMO</h1>
-      <h2 class="jumbotron-heading">Food Market Online</h2>
-    </div>
-  </section>
-
-  <div class="container">
-    <div class="row">
-      <div class="col-md-5">
-        <form action="/products/add" method="POST">
-          <input id="id" type="hidden" name="id" th:value="(${product} != null ? ${product.getIdProdukt()} : '')">
-          <div class="form-group">
-            <label for="name">Product name</label>
-            <input type="text"
-                   class="form-control"
-                   id="name"
-                   name="name"
-                   th:value="(${product} != null ? ${product.getIme()} : '')"
-                   required
-                   placeholder="Enter product name">
-          </div>
-          <div class="form-group">
-            <label for="price">Price</label>
-            <input type="text"
-                   class="form-control"
-                   id="price"
-                   name="price"
-                   required
-                   th:value="(${price?.getIznos()} )"
-                   placeholder="Price">
-          </div>
-          <div class="form-group">
-            <label for="Description">Description</label>
-            <input type="text"
-                   class="form-control"
-                   id="description"
-                   name="description"
-                   th:value="(${product} != null ? ${product.getOpis()} : '')"
-                   placeholder="Description">
-          </div>
-          <div class="form-group">
-            <label>Category</label>
-            <select name="category" class="form-control">
-              <option th:if="${chosen} != null"
-                      th:selected="${chosen.getIdKategorija() != null &&
-                                chosen.getIdKategorija() == cat.getIdKategorija()}"
-                      th:each="cat : ${categories}"
-                      th:value="${cat.getIdKategorija()}"
-                      th:text="${cat.getIme()}">
-              </option>
-              <option th:if="${chosen} == null"
-                      th:each="cat : ${categories}"
-                      th:value="${cat.getIdKategorija()}"
-                      th:text="${cat.getIme()}">
-              </option>
-            </select>
-          </div>
-          <div class="form-group">
-            <label>Date from</label>
-           <input type="date"
-                           class="form-control"
-                           id="date"
-                           name="date"
-                           th:value="${price?.getCenaOd()} ?: null"
-                           required>
-          </div>
-          <div class="form-group">
-            <label>Date to</label>
-            <input type="date"
-                   class="form-control"
-                   id="dateTo"
-                   name="dateTo"
-                   th:value="${price?.getCenaDo() }">
-          </div>
-
-          <button id="submit" type="submit" class="btn btn-primary">Submit</button>
-          <a type="button" class="btn btn-primary" href="/products">Back</a>
-        </form>
-      </div>
-    </div>
-  </div>
-
-
-</th:block>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
Index: src/main/resources/templates/cart.html
===================================================================
--- src/main/resources/templates/cart.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/cart.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,54 +1,10 @@
-<th:block xmlns:th="http://www.thymeleaf.org">
-    <section class="jumbotron text-center">
-        <div class="container">
-            <h3 class="jumbotron-heading">Shopping cart for
-                <th:block th:if="${#request.getRemoteUser() != null}" th:text="${#request.getRemoteUser()}"></th:block>
-            </h3>
-        </div>
-    </section>
-
-    <div th:if="${hasError}">
-        <h5 class="text-center text-danger" th:text="${error}"></h5>
-    </div>
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" th:if="${products.size() > 0}">
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">Product</th>
-                            <th scope="col">Total Price for product</th>
-                            <th scope="col">Quantity</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <span th:each="p:${po}">
-                        <tr th:each="product : ${products}" th:if="${product.getIdProdukt()}  == ${p.getIdProdukt()}" class="cart-item">
-                            <td th:text="${product.getIme()}"></td>
-                            <td th:text="${p.getCena()}">Cena</td>
-                            <td th:text="${p.getKolicina()}"></td>
-                        </tr>
-                            </span>
-                        </tbody>
-                    </table>
-
-                    <div>
-                        <label>Total price </label>
-                    <span th:text="${order.getVkupnoSuma()}"></span></div>
-
-                    <form  th:action="@{'/order/{id}/success' (id=${order.getIdNaracka()})}" th:method="POST">
-                        <label>Adresa za dostava</label>
-                        <input type="text" name="address" id="address" placeholder="/">
-                        <button type="submit"
-                                class="btn btn-sm btn-primary cart-product">
-                            <i class="fa fa-trash">Order</i>
-                        </button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</th:block>
-
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
Index: src/main/resources/templates/delivery.html
===================================================================
--- src/main/resources/templates/delivery.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/delivery.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,43 +1,10 @@
-<div th:if="${delivers.size() == 0}"
-     xmlns:sec="http://www.w3.org/1999/xhtml">
-    <h1 style="text-align: center"> No orders to deliver!</h1>
-</div>
-
-<div class="container mb-4" >
-    <div class="row">
-        <div class="col-12" th:if="${delivers.size() > 0}">
-            <div class="table-responsive">
-                <table class="table table-striped">
-                    <thead>
-                    <tr>
-                        <th scope="col">Order ID</th>
-                        <th scope="col">Address</th>
-                        <th scope="col">Total price</th>
-                        <th scope="col">Date</th>
-
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr th:each="delivery : ${delivers} " class="product">
-                        <td th:text="${delivery.getIdNaracka()}" ></td>
-                        <td th:each="order : ${orders}" th:if="${order.getIdNaracka() == delivery.getIdNaracka()}"
-                        th:text="${order.getAdresa()}"></td>
-                        <td  th:each="order : ${orders}"  th:if="${order.getIdNaracka() == delivery.getIdNaracka()}"
-                            th:text="${order.getVkupnoSuma()}"></td>
-                        <td th:text="${delivery.getDatum()}"
-                        ></td>
-                        <td class="text-right">
-                            <form th:method="POST" th:action="@{'/delivery/{id}' (id=${delivery.getIdDostava()})}">
-                                <button type="submit"
-                                        class="btn btn-sm btn-primary cart-product" sec:authorize="hasRole('ROLE_DELIVER')">
-                                    <i class="fa fa-trash">Order delivered</i>
-                                </button>
-                            </form>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
Index: src/main/resources/templates/home.html
===================================================================
--- src/main/resources/templates/home.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/home.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,10 +1,10 @@
-<section class="jumbotron text-center" xmlns:th="http://www.thymeleaf.org">
-    <div class="container">
-        <h1 class="jumbotron-heading">FMO</h1>
-        <h2 class="jumbotron-heading">Food Market Online</h2>
-    </div>
-</section>
-
-
-
-
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
Index: src/main/resources/templates/login.html
===================================================================
--- src/main/resources/templates/login.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/login.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,19 +1,10 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-  <form class="form-signin mt-xl-5" method="post" action="/login">
-    <h2 class="form-signin-heading">Sign in</h2>
-    <p>
-      <label for="username" class="sr-only">Username</label>
-      <input type="text" id="username" name="username" class="form-control" placeholder="Username" required=""
-             autofocus="">
-    </p>
-    <p>
-      <label for="password" class="sr-only">Password</label>
-      <input type="password" id="password" name="password" class="form-control" placeholder="Password"
-             required="">
-    </p>
-
-    <div th:text="${param.error}" class="text-danger"></div>
-
-    <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
-  </form>
-</div>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
Index: src/main/resources/templates/master_template.html
===================================================================
--- src/main/resources/templates/master_template.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/master_template.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.w3.org/1999/xhtml">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8">
@@ -13,63 +12,32 @@
 <body>
 
-<header xmlns:th="http://www.thymeleaf.org">
-  <nav class="navbar navbar-expand-md navbar-dark bg-dark">
-    <div class="container">
-      <a class="navbar-brand" href="/">FMO</a>
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
-              aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
+<nav class="navbar navbar-inverse">
+  <div class="container-fluid">
 
-      <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
-        <ul class="navbar-nav m-auto">
-          <li class="nav-item m-auto">
-            <a class="nav-link active" href="/products">Products</a>
-          </li>
-          <li class="nav-item m-auto" sec:authorize="hasRole('ROLE_ADMIN')">
-            <a class="nav-link active" th:href="@{/statistics}" th:method="GET">Statistics</a>
-          </li>
-          <li class="nav-item m-auto" sec:authorize="hasRole('ROLE_DELIVER')">
-            <a class="nav-link active" th:href="@{/delivery}" th:method="GET">Delivery</a>
-          </li>
-        </ul>
-
-
-        <ul class="nav navbar-nav navbar-right">
-
-
-          <li class="nav-item" sec:authorize="hasRole('ROLE_USER')">
-            <a class="btn btn-success btn-sm ml-3" th:href="@{/order}" th:method="GET">
-              <i class="fa fa-shopping-cart"></i> Cart
-            </a>
-          </li>
-          <li class="nav-item" sec:authorize="isAuthenticated()">
-            <a class="btn btn-light btn-sm ml-3" href="/logout">
-              <i class="fa fa-shopping-cart"></i> Logout
-            </a>
-          <li class="nav-item">
-            <a class="btn btn-light btn-sm ml-3" sec:authorize="!isAuthenticated()" href="/register">
-              <i class="fa fa-shopping-cart"></i> Register
-            </a>
-          </li>
-          <li class="nav-item" sec:authorize="!isAuthenticated()">
-            <a class="btn btn-light btn-sm ml-3" href="/login">
-              <i class="fa fa-shopping-cart"></i> Login
-            </a>
-          </li>
-        </ul>
-      </div>
+    <div class="collapse navbar-collapse" id="myNavbar">
+      <ul class="nav navbar-nav">
+        <li class="active"><a href="home.html">Home</a></li>
+        <li><a href="products.html">Products</a></li>
+        <li><a href="statistics.html">Statistics</a></li>
+        <li><a href="delivery.html">Delivery</a></li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="register.html"><span class="glyphicon glyphicon-user"></span>Register</a></li>
+        <li><a href="/login"><span class="glyphicon glyphicon-user"></span>Login</a></li>
+        <li><a href="cart.html"><span class="glyphicon glyphicon-shopping-cart"></span> Cart</a></li>
+        <li><a href="/logout"><span class="glyphicon glyphicon-user"></span>Log out</a></li>
+      </ul>
     </div>
-  </nav>
-</header>
+  </div>
+</nav>
 
 
 
-<section th:include="${bodyContent}"></section>
+<section th:include="${bodyContent}">
 
 
 
 
-<footer class="container-fluid text-center" style="padding-top: 100px">
+<footer class="container-fluid text-center">
   <p>FMO Store</p>
   <p>2023</p>
Index: src/main/resources/templates/not_valid_delete.html
===================================================================
--- src/main/resources/templates/not_valid_delete.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/not_valid_delete.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,5 +1,10 @@
-<div>
-  <h2 style="text-align: center">Produktot se naogja vo edna ili povekje naracki i zatoa ne moze da bide izbrishen!</h2>
-  <a style="text-align: center; display: block" href="/products">Back to products</a>
-
-</div>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
Index: src/main/resources/templates/product_info.html
===================================================================
--- src/main/resources/templates/product_info.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/product_info.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,24 +1,10 @@
-<div xmlns:th="http://www.thymeleaf.org" >
-
-  <form class="block" th:method="post" th:action="@{'/products/{id}/add-to-cart' (id = ${product.getIdProdukt()})}">
-      <input type="hidden" name="idKorisnik" id="idKorisnik" th:value="${#request.getRemoteUser()}">
-      <input type="hidden" name="cena" id="cena" th:value="${price.getIznos()}">
-      <label style="margin: auto; text-align: center; display: block; padding-top: 20px">Product name</label>
-      <p style="margin: auto; text-align: center" id="name" name="name" th:value="${product.getIme()}" th:text="${product.getIme()}"></p>
-      <label style="margin: auto; text-align: center; display: block;  padding-top: 20px">Product description</label>
-      <p style="margin: auto; text-align: center" name="description" id="description"  th:value="${product.getOpis()}" th:text="${product.getOpis()}"></p>
-      <label style="margin: auto; text-align: center; display: block ; padding-top: 20px">price</label>
-      <p style="margin: auto; text-align: center" name="price" id="price" th:value="${price.getIznos()}" th:text="${price.getIznos()}"></p>
-      <label style="margin: auto; text-align: center; display: block;  padding-top: 20px">Category</label>
-      <p style="margin: auto; text-align: center;" name="category" id="category" th:value="${kat.getIme()}" th:text="${kat.getIme()}"></p>
-      <label style="margin: auto; text-align: center; display: block;  padding-top: 20px">Quantity</label>
-      <input type="number" name="quantity" id="quantity" style="margin: auto; text-align: center; display: block" required="required">
-
-
-      <button style="margin: auto; text-align: center; display: block;  padding-top: 20px" id="submit" type="submit" class="btn btn-primary">Submit</button>
-      <a style="margin: auto; text-align: center; display: block;  padding-top: 20px; width: 75px" type="button" class="btn btn-primary" href="/products">Back</a>
-
-  </form>
-
-
-</div>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
Index: src/main/resources/templates/products.html
===================================================================
--- src/main/resources/templates/products.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/products.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,69 +1,10 @@
-<div xmlns:th="http://www.thymeleaf.org" xmlns:sec="">
-    <section class="jumbotron text-center">
-        <div class="container">
-            <h1 class="jumbotron-heading">Food Market Online</h1>
-            <h3 class="jumbotron-heading">All products</h3>
-        </div>
-    </section>
-<!--//th:method="GET" th:action="@{/products}"-->
-    <div class="container mb-4" >
-        <div class="row">
-            <div class="col-12" th:if="${products.size() > 0}">
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">Product name</th>
-                            <th scope="col">Price</th>
-                            <th scope="col">Category</th>
-
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="product : ${products} " class="product">
-                            <td th:text="${product.getIme()}" ></td>
-                            <td th:each="price: ${prices}" th:if="${price.getIdProdukt()} ==  ${product.getIdProdukt()}"
-                                th:text="${price.getIznos()}">Cena</td>
-                            <td th:each="category: ${categories}" th:if="${category.getIdProdukt()} ==  ${product.getIdProdukt()}"
-                                ><span th:each="k:${kat}" th:if="${k.getIdKategorija()} == ${category.getIdKategorija()}"
-                                th:text="${k.getIme()}"></span></td>
-                            <td class="text-right">
-                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">
-                                    <form th:action="@{'/products/delete/{id}' (id=${product.getIdProdukt()})}"
-                                          th:method="DELETE">
-                                        <button type="submit"
-                                                class="btn btn-sm btn-danger delete-product">
-                                            <i class="fa fa-trash">Delete</i>
-                                        </button>
-                                    </form>
-                                </th:block>
-                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">
-                                    <a th:href="@{'/products/edit-form/{id}' (id=${product.getIdProdukt()})}"
-                                       class="btn btn-sm btn-info edit-product">
-                                        <i class="fa fa-trash">Edit</i>
-                                    </a>
-                                </th:block>
-                                <form th:method="GET" th:action="@{'/products/{id}' (id=${product.getIdProdukt()})}">
-                                    <button type="submit"
-                                            class="btn btn-sm btn-primary cart-product" sec:authorize="hasRole('ROLE_USER')">
-                                        <i class="fa fa-trash">Add product to cart</i>
-                                    </button>
-                                </form>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="col mb-3">
-                <div class="row">
-                    <div class="col-sm-12 col-md-12"  sec:authorize="hasRole('ROLE_ADMIN')">
-                        <a href="/products/add-form" class="btn btn-block btn-dark add-product-btn">
-                            Add new product
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
Index: src/main/resources/templates/register.html
===================================================================
--- src/main/resources/templates/register.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/register.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,35 +1,10 @@
-<div class="container">
-    <h1 th:if="${hasError}" th:text="${error}"></h1>
-</div>
-<div class="container">
-    <form class="form-signin mt-xl-5" method="post" action="/register">
-        <h2 class="form-signin-heading">Register</h2>
-        <p>
-            <label for="name_surname" class="sr-only">Name and Surname</label>
-            <input type="text" id="name_surname" name="name_surname" class="form-control" autocomplete="off" placeholder="name_surname" required=""
-                   autofocus="">
-        </p>
-        <p>
-            <label for="password" class="sr-only">Password</label>
-            <input type="password" id="password" name="password" class="form-control" placeholder="Password" autocomplete="off"
-                   required="">
-        </p>
-        <p>
-            <label for="repeatedPassword" class="sr-only">Repeat Password</label>
-            <input type="password" id="repeatedPassword" name="repeatedPassword" class="form-control" autocomplete="off"
-                   placeholder="Repeat Password" required="">
-        </p>
-        <p>
-            <label for="mail" class="sr-only">Mail</label>
-            <input type="text" id="mail" name="mail" class="form-control" placeholder="Mail" required="" autofocus="" autocomplete="off">
-        </p>
-        <p>
-            <label for="number" class="sr-only">Telephone number</label>
-            <input type="text" id="number" name="number" class="form-control" placeholder="number" required="" autocomplete="off"
-                   autofocus="">
-        </p>
-
-        <button class="btn btn-lg btn-primary btn-block" type="submit">Register</button>
-    </form>
-</div>
-
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
Index: src/main/resources/templates/statistics.html
===================================================================
--- src/main/resources/templates/statistics.html	(revision d14176d864a9e378a444b7d3a7c0e15a27d0113d)
+++ src/main/resources/templates/statistics.html	(revision 1dd922639ddb0583e5e61efee73ed97f3f8aa165)
@@ -1,63 +1,10 @@
-<th:block>
-    <h3 style="text-align: center;color: lightslategrey; margin: 50px">За секој корисник да се најде бројот на нарачки, да се прикаже просечна сума на сите нарачки за сите корисници, вкупна сума на нарачките на купувачот, колку негови нарачки се над глобалниот просек за сума на нарачка и колку е вкупната сума на неговите нарачки кои се над просекот</h3>
-<div class="container mb-4" >
-    <div class="row">
-        <div class="col-12">
-            <div class="table-responsive">
-                <table class="table table-striped">
-                    <thead>
-                    <tr>
-                        <th scope="col">ID</th>
-                        <th scope="col">Ime</th>
-                        <th scope="col">Vkupno naracki</th>
-                        <th scope="col">Prosecna suma na naracka za site kupuvaci</th>
-                        <th scope="col">Vkupna suma od site naracki na korisnikot</th>
-                        <th scope="col">Vkupno naracki nad prosek na korisnikot</th>
-                        <th scope="col">Vkupno suma na naracki nad prosek za korisnikot</th>
-
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr th:each="user : ${users} " class="product">
-                        <td th:each="u : ${user}" th:text="${u} ?: '0' " ></td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
-
-    <h3 style="text-align: center;color: lightslategrey; margin: 50px">За секој продукт наоѓаме во последните три месеци во колку нарачки е присутен, колкава е количината на продуктот во тие нарачки, просечна сума на нарачката во која е присутен продуктот, број на нарачки на продуктот кои корисникот сам ги подигнал, количина продадена на продуктот која корисникот сам ја подигнал, број на нарачки на продукот кои му биле доставени на корисникот и количина на продуктот која му била доставена на корисникот</h3>
-    <div class="container mb-4" >
-        <div class="row">
-            <div class="col-12">
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">ID</th>
-                            <th scope="col">Produkt ime</th>
-                            <th scope="col">Broj na naracki vo koi e prisuten produktot</th>
-                            <th scope="col">Kolicina prodadeno od produktot</th>
-                            <th scope="col">Prosecna suma na naracka vo koja se sodrzi produktot</th>
-                            <th scope="col">Broj na naracki na produktot koi korisnikot sam ke gi podigne</th>
-                            <th scope="col">Kolicina prodadena na produktot bez dostava</th>
-                            <th scope="col">Broj na naracki na produktot koi ke bidat dostaveni na korisnikot</th>
-                            <th scope="col">Kolicina prodadena na produktot preku dostava</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="product : ${products} " class="product">
-                            <td th:each="p : ${product}" th:text="${p} ?: '0' " ></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-
-</th:block>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
