Index: src/main/resources/templates/addDiscount.html
===================================================================
--- src/main/resources/templates/addDiscount.html	(revision 40935d39c559d7bead40536a999735ce35ae220b)
+++ src/main/resources/templates/addDiscount.html	(revision 1e7126f5a33606e77623e4ac53fe5e67aa7c19fc)
@@ -1,10 +1,48 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>$Title$</title>
-</head>
-<body>
-$END$
-</body>
-</html>
+<th:block xmlns:th="http://www.thymeleaf.org">
+    <div style="color: white" class="container">
+        <h1 class="jumbotron-heading">Додани нов попуст</h1>
+        <div class="row">
+            <div class="col-md-5">
+                <form action="/home/addD" method="POST">
+                    <div class="form-group">
+                        <label for="code">Код</label>
+                        <input type="text"
+                               class="form-control"
+                               id="code"
+                               name="code"
+                               required
+                               placeholder="внеси код">
+                    </div>
+                    <div class="form-group">
+                        <label for="validity">Валиндост</label>
+                        <input type="date"
+                               class="form-control"
+                               id="validity"
+                               name="validity"
+                               placeholder="Валидност">
+                    </div>
+                    <div class="form-group">
+                        <label for="type">Тип</label>
+                        <input type="text"
+                               class="form-control"
+                               id="type"
+                               name="type"
+                               placeholder="Тип">
+                    </div>
+                    <div class="form-group">
+                        <label for="percent">Процент</label>
+                        <input type="number"
+                               class="form-control"
+                               id="percent"
+                               name="percent"
+                        >
+                    </div>
+                    <button style="background-color: #ff5019" id="submit" type="submit" class="btn btn-primary">Додади</button>
+                </form>
+            </div>
+
+        </div>
+
+    </div>
+
+</th:block>
Index: src/main/resources/templates/addProjection.html
===================================================================
--- src/main/resources/templates/addProjection.html	(revision 40935d39c559d7bead40536a999735ce35ae220b)
+++ src/main/resources/templates/addProjection.html	(revision 1e7126f5a33606e77623e4ac53fe5e67aa7c19fc)
@@ -17,5 +17,5 @@
                     <div class="form-group">
                         <label for="date_time_start">Почетен датум</label>
-                        <input type="date"
+                        <input type="datetime-local"
                                class="form-control"
                                id="date_time_start"
@@ -25,5 +25,5 @@
                     <div class="form-group">
                         <label for="date_time_end">Краен датум</label>
-                        <input type="date"
+                        <input type="datetime-local"
                                class="form-control"
                                id="date_time_end"
@@ -41,5 +41,24 @@
                         </select>
                     </div>
-
+                    <div class="form-group">
+                        <label>Сала</label>
+                        <select name="id_room" id="pr" class="form-control">
+                            <option
+                                    th:each="pr : ${projection_rooms}"
+                                    th:value="${pr.id_room}"
+                                    th:text="${pr.projection_room_number} + '-' + ${pr.cinema.name}">
+                            </option>
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <label>Попуст</label>
+                        <select name="id_discount" id="f2" class="form-control">
+                            <option
+                                    th:each="d : ${discounts}"
+                                    th:value="${d.id_discount}"
+                                    th:text="${d.type} + '-' + ${d.percent}">
+                            </option>
+                        </select>
+                    </div>
                     <button style="background-color: #ff5019" id="submit" type="submit" class="btn btn-primary">Додади</button>
                 </form>
Index: src/main/resources/templates/films.html
===================================================================
--- src/main/resources/templates/films.html	(revision 40935d39c559d7bead40536a999735ce35ae220b)
+++ src/main/resources/templates/films.html	(revision 1e7126f5a33606e77623e4ac53fe5e67aa7c19fc)
@@ -216,4 +216,16 @@
 
     </div>
+        <div class="form-group">
+            <label style="color: white;font-size: 20px;font-weight: bold">Избери Жарн:</label>
+            <select name="id_cinema" class="form-control" id="id_cinema">
+                <option
+                        th:selected="${genres.get(1)}"
+                        th:each="genre : ${genres}"
+                        th:value="${}"
+                        th:text="${cinema.getName()}">
+                </option>
+            </select>
+
+        </div>
         <button class="button" type="submit">Filter</button>
     </form>
@@ -223,5 +235,5 @@
         <div    th:if="${films.isEmpty()} == false"
                 th:each="film : ${films}" class="container">
-            <div class="card">
+            <div class="card" style="margin-left: 2%;margin-bottom: 2%">
                 <div class="imgBx">
                     <img th:src="@{${film.getUrl()}}"/>
Index: src/main/resources/templates/fragments/header.html
===================================================================
--- src/main/resources/templates/fragments/header.html	(revision 40935d39c559d7bead40536a999735ce35ae220b)
+++ src/main/resources/templates/fragments/header.html	(revision 1e7126f5a33606e77623e4ac53fe5e67aa7c19fc)
@@ -69,19 +69,28 @@
             <li class="begin"><a href="/myTickets">Мои Карти</a></li>
         </th:block>
-        <th:block sec:authorize="hasAuthority('ROLE_ADMIN')">
-        <li class="begin"><a href="/workers">Вработени</a></li>
-        </th:block>
-        <th:block sec:authorize="hasAuthority('ROLE_ADMIN')">
-        <li class="begin"><a href="/addProjection">Нова Проекција</a></li>
-        </th:block>
-        <th:block sec:authorize="hasAuthority('ROLE_ADMIN')">
-        <li class="begin"><a href="/addFilm">Нов Филм</a></li>
-        </th:block>
-        <th:block sec:authorize="hasAuthority('ROLE_ADMIN')">
-        <li class="begin"><a href="/addEvent">Нов Настан</a></li>
+
+        <th:block sec:authorize="hasAuthority('ROLE_ADMIN')" th:if="${#request.getRemoteUser()}">
+            <li class="nav-item dropdown" style="width: 20px">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="padding: 0">
+                </a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                    <a class="dropdown-item" href="/workers">Вработени</a>
+                    <a class="dropdown-item" href="/addProjection">Нова Проекција</a>
+                    <a class="dropdown-item" href="/addFilm">Нов Филм</a>
+                    <a class="dropdown-item" href="/addEvent">Нов Настан</a>
+                    <a class="dropdown-item" href="/addDiscount">Нов Попуст</a>
+                </div>
+            </li>
         </th:block>
     </ul>
     <ul class="menu-right">
         <th:block sec:authorize="hasAuthority('ROLE_ADMIN')" th:if="${#request.getRemoteUser() != null}">
+            <li class="reg">
+                <a href="/profileWorker">
+                    <th:block th:text="${#request.getRemoteUser()}"></th:block>
+                </a>
+            </li>
+        </th:block>
+        <th:block sec:authorize="hasAuthority('ROLE_WORKER')" th:if="${#request.getRemoteUser() != null}">
             <li class="reg">
                 <a href="/profileWorker">
Index: src/main/resources/templates/myTickets.html
===================================================================
--- src/main/resources/templates/myTickets.html	(revision 40935d39c559d7bead40536a999735ce35ae220b)
+++ src/main/resources/templates/myTickets.html	(revision 1e7126f5a33606e77623e4ac53fe5e67aa7c19fc)
@@ -29,5 +29,5 @@
     <div class="row">
         <div class="col-12 mt-3" style="padding-left:100px;height:75%;">
-            <div class="card" th:each="ticket : ${tickets}" style=" border-radius: 30px;width:92%;align-self:center">
+            <div class="card" th:each="t : ${tickets}" style=" border-radius: 30px;width:92%;align-self:center; margin-bottom: 5%">
                 <div class="card-horizontal" >
                     <div class="card-body">
@@ -36,23 +36,23 @@
                             <div>
                                 <span>Филм:</span>
-                                <span th:text="${ticket.projection.film.name}"></span></div>
+                                <span th:text="${t.ticket.projection.film.name}"></span></div>
                             <div>
                                 <span>Почеток на проекција: </span>
-                                <span th:text="${ticket.projection.date_time_start}"></span></div>
+                                <span th:text="${t.ticket.projection.date_time_start}"></span></div>
                             <div>
                                 <span>Крај на проекција: </span>
-                                <span th:text="${ticket.projection.date_time_end}"></span></div>
+                                <span th:text="${t.ticket.projection.date_time_end}"></span></div>
                         </h4>
 
-                        <p class="card-text" th:text="${ticket.projection.type_of_technology}"></p>
-                        <span>Број на седиште: </span><p class="card-text" th:text="${ticket.seat.seat_number}"></p>
-                        <span>Цена: </span><p class="card-text" th:text="${ticket.price}"></p>
+                        <p class="card-text" th:text="${t.ticket.projection.type_of_technology}"></p>
+                        <span>Број на седиште: </span><p class="card-text" th:text="${t.ticket.seat.seat_number}"></p>
+                        <span>Цена: </span><p class="card-text" th:text="${t.ticket.price}"></p>
                     </div>
                 </div>
                 <div class="card-footer" style="border-bottom-right-radius:30px;border-bottom-left-radius:30px">
                     <small>
-                        <form th:action="@{'/home/getSeats/{id}' (id=${ticket.id_ticket})}"
-                              th:method="GET">
-                            <--button th:if="${ticket.projection.date_time_start != null and #dates.isBefore(java.time.LocalDateTime.of(ticket.projection.date_time_start, java.time.LocalTime.MIN).toInstant(java.time.ZoneOffset.UTC).toEpochMilli(), java.util.Date.from(java.time.LocalDate.now().atStartOfDay(java.time.ZoneId.systemDefault()).toInstant()).getTime())}" class="button" type="submit">Откажи</--button>
+                        <form th:action="@{'/cancelTicket/{id}' (id=${t.ticket.id_ticket})}"
+                              th:method="POST">
+                            <button th:if="${t.canCancel}" class="button" type="submit">Откажи</button>
                         </form>
 
