Index: src/main/resources/templates/fragments/header.html
===================================================================
--- src/main/resources/templates/fragments/header.html	(revision bde8b1381c72e66b4414f8010493f3f189b15c03)
+++ src/main/resources/templates/fragments/header.html	(revision 4251327f208328dfc9df9dfa02b324ada0ced20a)
@@ -10,5 +10,5 @@
       <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
         <ul class="navbar-nav m-auto">
-          <li class="nav-item m-auto">
+          <li sec:hasRole class="nav-item m-auto">
             <a class="nav-link active" href="/bilet">Bileti</a>
           </li>
@@ -42,9 +42,5 @@
             <a class="nav-link" href="#"></a>
           </li>
-          <li class="nav-item">
-            <a class="btn btn-success btn-sm ml-3" href="/shopping-cart">
-              <i class="fa fa-shopping-cart"></i> Cart
-            </a>
-          </li>
+
           <li class="nav-item" sec:authorize="isAuthenticated()">
             <a href="#" class="btn btn-light btn-sm ml-3" sec:authentication="name">
Index: src/main/resources/templates/kontrola.html
===================================================================
--- src/main/resources/templates/kontrola.html	(revision bde8b1381c72e66b4414f8010493f3f189b15c03)
+++ src/main/resources/templates/kontrola.html	(revision 4251327f208328dfc9df9dfa02b324ada0ced20a)
@@ -1,10 +1,7 @@
 <div xmlns:th="http://www.thymeleaf.org">
-    <section class="jumbotron text-center">
-        <div class="container">
-            <h1 class="jumbotron-heading">WEB PROGRAMMING SHOP</h1>
-            <h3 class="jumbotron-heading">All products</h3>
-        </div>
-    </section>
 
+    <div class="container mb-4">
+        <div class="row">
+            <div class="col-12" >
 
     <form class="form-signin mt-xl-5" method="post" th:action="@{'/kontrola/{id}/kazni-neregistriran'(id=${kontrola.kontrolaId})}">
@@ -12,5 +9,5 @@
 
         <p>
-            <label for="dokument" class="sr-only">Email</label>
+            <label for="dokument" >Dokument</label>
             <input class="form-control" name="dokument" id="dokument" type="text">
         </p>
@@ -18,15 +15,15 @@
 
         <p>
-            <label for="telefon" class="sr-only">Telefon</label>
+            <label for="telefon" >Telefon</label>
             <input class="form-control" name="telefon" id="telefon" type="text">
         </p>
 
         <p>
-            <label for="ime" class="sr-only">Ime</label>
+            <label for="ime" >Ime</label>
             <input class="form-control" name="ime" id="ime" type="text">
         </p>
 
         <p>
-            <label for="adresa" class="sr-only">Adresa</label>
+            <label for="adresa" >Adresa</label>
             <input class="form-control" name="adresa" id="adresa" type="text">
         </p>
@@ -34,5 +31,5 @@
 
         <p>
-            <label for="iznos" class="sr-only">Iznos</label>
+            <label for="iznos" >Iznos</label>
             <input class="form-control" name="iznos" id="iznos" type="number">
         </p>
@@ -49,19 +46,20 @@
 
 
+
     <form class="form-signin mt-xl-5" method="post" th:action="@{'/kontrola/{id}/kazni-registriran'(id=${kontrola.kontrolaId})}">
         <h2 class="form-signin-heading">Kazna za regirstiran</h2>
 
         <p>
-            <label for="dk" class="sr-only">Dokument</label>
+            <label for="dk" >Dokument</label>
             <input class="form-control" name="dokument" id="dk" type="text">
         </p>
 
         <p>
-            <label for="iz" class="sr-only">Iznos</label>
+            <label for="iz" >Iznos</label>
             <input class="form-control" name="iznos" id="iz" type="number">
         </p>
 
         <p>
-            <label for="patnik" class="sr-only">Patnik</label>
+            <label for="patnik" >Patnik</label>
             <select id="patnik" name="patnik" class="form-control">
                 <option th:each="patnik : ${patnici}"
@@ -82,4 +80,9 @@
         </div>
     </form>
+
+            </div>
+        </div>
+    </div>
+
 
 
@@ -114,29 +117,24 @@
 
                             <td class="text-right">
-                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">
-                                    <form th:action="@{'/products/delete/{id}' (id=${kazna.kzId})}"
-                                          th:method="DELETE">
-                                        <button type="submit"
-                                                class="btn btn-sm btn-danger delete-product">
-                                            <i class="fas fa-trash-alt"></i> Delete
-                                        </button>
-                                    </form>
-                                </th:block>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <form th:action="@{'/products/delete/{id}' (id=${kazna.kzId})}"-->
+<!--                                          th:method="DELETE">-->
+<!--                                        <button type="submit"-->
+<!--                                                class="btn btn-sm btn-danger delete-product">-->
+<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
+<!--                                        </button>-->
+<!--                                    </form>-->
+<!--                                </th:block>-->
                             </td>
                             <td>
-                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">
-                                    <a th:href="@{'/products/edit-form/{id}' (id=${kazna.kzId})}"
-                                       class="btn btn-sm btn-info edit-product">
-                                        <i class="fas fa-edit"></i> Edit
-                                    </a>
-                                </th:block>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${kazna.kzId})}"-->
+<!--                                       class="btn btn-sm btn-info edit-product">-->
+<!--                                        <i class="fas fa-edit"></i> Edit-->
+<!--                                    </a>-->
+<!--                                </th:block>-->
                             </td>
                             <td>
-                                <form th:action="@{'/shopping-cart/add-product/{id}' (id=${kazna.kzId})}"
-                                      th:method="POST">
-                                    <button type="submit" class="btn btn-sm btn-success add-to-cart">
-                                        <i class="fas fa-shopping-cart"></i> Add to cart
-                                    </button>
-                                </form>
+
                             </td>
                         </tr>
Index: src/main/resources/templates/kupiBilet.html
===================================================================
--- src/main/resources/templates/kupiBilet.html	(revision bde8b1381c72e66b4414f8010493f3f189b15c03)
+++ src/main/resources/templates/kupiBilet.html	(revision 4251327f208328dfc9df9dfa02b324ada0ced20a)
@@ -1,9 +1,4 @@
 <div xmlns:th="http://www.thymeleaf.org">
-    <section class="jumbotron text-center">
-        <div class="container">
-            <h1 class="jumbotron-heading">WEB PROGRAMMING SHOP</h1>
-            <h3 class="jumbotron-heading">All products</h3>
-        </div>
-    </section>
+
 
     <div style="width: 500px">
Index: src/main/resources/templates/listBileti.html
===================================================================
--- src/main/resources/templates/listBileti.html	(revision bde8b1381c72e66b4414f8010493f3f189b15c03)
+++ src/main/resources/templates/listBileti.html	(revision 4251327f208328dfc9df9dfa02b324ada0ced20a)
@@ -1,9 +1,4 @@
 <div xmlns:th="http://www.thymeleaf.org">
-    <section class="jumbotron text-center">
-        <div class="container">
-            <h1 class="jumbotron-heading">WEB PROGRAMMING SHOP</h1>
-            <h3 class="jumbotron-heading">All products</h3>
-        </div>
-    </section>
+
 
     <div class="container mb-4">
@@ -31,29 +26,24 @@
 
                             <td class="text-right">
-                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">
-                                    <form th:action="@{'/products/delete/{id}' (id=${bilet.bId})}"
-                                          th:method="DELETE">
-                                        <button type="submit"
-                                                class="btn btn-sm btn-danger delete-product">
-                                            <i class="fas fa-trash-alt"></i> Delete
-                                        </button>
-                                    </form>
-                                </th:block>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <form th:action="@{'/products/delete/{id}' (id=${bilet.bId})}"-->
+<!--                                          th:method="DELETE">-->
+<!--                                        <button type="submit"-->
+<!--                                                class="btn btn-sm btn-danger delete-product">-->
+<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
+<!--                                        </button>-->
+<!--                                    </form>-->
+<!--                                </th:block>-->
                             </td>
                             <td>
-                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">
-                                    <a th:href="@{'/products/edit-form/{id}' (id=${bilet.bId})}"
-                                       class="btn btn-sm btn-info edit-product">
-                                        <i class="fas fa-edit"></i> Edit
-                                    </a>
-                                </th:block>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${bilet.bId})}"-->
+<!--                                       class="btn btn-sm btn-info edit-product">-->
+<!--                                        <i class="fas fa-edit"></i> Edit-->
+<!--                                    </a>-->
+<!--                                </th:block>-->
                             </td>
                             <td>
-                                <form th:action="@{'/shopping-cart/add-product/{id}' (id=${bilet.bId})}"
-                                      th:method="POST">
-                                    <button type="submit" class="btn btn-sm btn-success add-to-cart">
-                                        <i class="fas fa-shopping-cart"></i> Add to cart
-                                    </button>
-                                </form>
+
                             </td>
                         </tr>
Index: src/main/resources/templates/listInstanci.html
===================================================================
--- src/main/resources/templates/listInstanci.html	(revision bde8b1381c72e66b4414f8010493f3f189b15c03)
+++ src/main/resources/templates/listInstanci.html	(revision 4251327f208328dfc9df9dfa02b324ada0ced20a)
@@ -1,9 +1,4 @@
 <div xmlns:th="http://www.thymeleaf.org">
-    <section class="jumbotron text-center">
-        <div class="container">
-            <h1 class="jumbotron-heading">WEB PROGRAMMING SHOP</h1>
-            <h3 class="jumbotron-heading">All products</h3>
-        </div>
-    </section>
+
 
     <div class="container mb-4">
@@ -61,5 +56,5 @@
                                       th:method="GET">
                                     <button type="submit" class="btn btn-sm btn-success add-to-cart">
-                                        <i class="fas fa-shopping-cart"></i> Kontrola
+                                         Kontrola
                                     </button>
                                 </form>
Index: src/main/resources/templates/listKazni.html
===================================================================
--- src/main/resources/templates/listKazni.html	(revision bde8b1381c72e66b4414f8010493f3f189b15c03)
+++ src/main/resources/templates/listKazni.html	(revision 4251327f208328dfc9df9dfa02b324ada0ced20a)
@@ -1,9 +1,4 @@
 <div xmlns:th="http://www.thymeleaf.org">
-    <section class="jumbotron text-center">
-        <div class="container">
-            <h1 class="jumbotron-heading">WEB PROGRAMMING SHOP</h1>
-            <h3 class="jumbotron-heading">All products</h3>
-        </div>
-    </section>
+
 
     <div class="container mb-4">
@@ -16,5 +11,7 @@
                             <th scope="col">#</th>
                             <th scope="col">Iznos</th>
+                            <th scope="col">Datum</th>
                             <th scope="col">Plateno</th>
+                            <th scope="col">Datum plateno</th>
                             <th scope="col">Dokument</th>
                             <th scope="col"></th>
@@ -27,31 +24,33 @@
                             <td th:text="${kazna.kzId}"></td>
                             <td th:text="${kazna.kzIznos}"></td>
+                            <td th:text="${kazna.kzDatum}"></td>
                             <td th:text="${kazna.kzPlateno}"></td>
+                            <td th:text="${kazna.kzDatumPlateno}"></td>
                             <td th:text="${kazna.kzDokument}"></td>
 
                             <td class="text-right">
-                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">
-                                    <form th:action="@{'/products/delete/{id}' (id=${kazna.kzId})}"
-                                          th:method="DELETE">
-                                        <button type="submit"
-                                                class="btn btn-sm btn-danger delete-product">
-                                            <i class="fas fa-trash-alt"></i> Delete
-                                        </button>
-                                    </form>
-                                </th:block>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <form th:action="@{'/products/delete/{id}' (id=${kazna.kzId})}"-->
+<!--                                          th:method="DELETE">-->
+<!--                                        <button type="submit"-->
+<!--                                                class="btn btn-sm btn-danger delete-product">-->
+<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
+<!--                                        </button>-->
+<!--                                    </form>-->
+<!--                                </th:block>-->
                             </td>
                             <td>
-                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">
-                                    <a th:href="@{'/products/edit-form/{id}' (id=${kazna.kzId})}"
-                                       class="btn btn-sm btn-info edit-product">
-                                        <i class="fas fa-edit"></i> Edit
-                                    </a>
-                                </th:block>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${kazna.kzId})}"-->
+<!--                                       class="btn btn-sm btn-info edit-product">-->
+<!--                                        <i class="fas fa-edit"></i> Edit-->
+<!--                                    </a>-->
+<!--                                </th:block>-->
                             </td>
                             <td>
-                                <form th:action="@{'/shopping-cart/add-product/{id}' (id=${kazna.kzId})}"
+                                <form th:action="@{'/kazna/{id}/pay' (id=${kazna.kzId})}"
                                       th:method="POST">
                                     <button type="submit" class="btn btn-sm btn-success add-to-cart">
-                                        <i class="fas fa-shopping-cart"></i> Add to cart
+                                         Pay
                                     </button>
                                 </form>
Index: src/main/resources/templates/listVozenja.html
===================================================================
--- src/main/resources/templates/listVozenja.html	(revision bde8b1381c72e66b4414f8010493f3f189b15c03)
+++ src/main/resources/templates/listVozenja.html	(revision 4251327f208328dfc9df9dfa02b324ada0ced20a)
@@ -6,4 +6,12 @@
         </div>
     </section>
+
+    <form method="get" action="/vozenje">
+        <select name="status">
+            <option th:each="status : ${vozStatus}" th:value="${status}" th:text="${status.name()}"></option>
+        </select>
+
+        <input type="submit" value="Search">
+    </form>
 
     <div class="container mb-4">
@@ -33,10 +41,11 @@
 
                             <td class="text-right">
-                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">
-                                    <form th:action="@{'/products/delete/{id}' (id=${vozenje.vozenjeId})}"
-                                          th:method="DELETE">
+                                <th:block  >
+                                    <form th:action="@{'/vozenje/{id}/end' (id=${vozenje.vozenjeId})}"
+                                          th:hidden="${vozenje.vozenjeStatus.name().equals('FINISHED')} ? 'true' : 'false'"
+                                          th:method="GET">
                                         <button type="submit"
                                                 class="btn btn-sm btn-danger delete-product">
-                                            <i class="fas fa-trash-alt"></i> Delete
+                                            <i class="fas fa-trash-alt"></i> End
                                         </button>
                                     </form>
@@ -44,18 +53,13 @@
                             </td>
                             <td>
-                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">
-                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"
-                                       class="btn btn-sm btn-info edit-product">
-                                        <i class="fas fa-edit"></i> Edit
-                                    </a>
-                                </th:block>
+<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
+<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"-->
+<!--                                       class="btn btn-sm btn-info edit-product">-->
+<!--                                        <i class="fas fa-edit"></i> Edit-->
+<!--                                    </a>-->
+<!--                                </th:block>-->
                             </td>
                             <td>
-                                <form th:action="@{'/vozenje/{vozenjeId}/end'(vozenjeId=${vozenje.vozenjeId})}"
-                                      th:method="GET">
-                                    <button type="submit" class="btn btn-sm btn-success add-to-cart">
-                                        <i class="fas fa-shopping-cart"></i> End vozenje
-                                    </button>
-                                </form>
+
                             </td>
                         </tr>
Index: src/main/resources/templates/master-template.html
===================================================================
--- src/main/resources/templates/master-template.html	(revision bde8b1381c72e66b4414f8010493f3f189b15c03)
+++ src/main/resources/templates/master-template.html	(revision 4251327f208328dfc9df9dfa02b324ada0ced20a)
@@ -20,4 +20,6 @@
 <header th:replace="fragments/header"/>
 
+<div th:text="${error}"></div>
+
 <section th:include="${bodyContent}">
 
Index: src/main/resources/templates/register.html
===================================================================
--- src/main/resources/templates/register.html	(revision bde8b1381c72e66b4414f8010493f3f189b15c03)
+++ src/main/resources/templates/register.html	(revision 4251327f208328dfc9df9dfa02b324ada0ced20a)
@@ -1,9 +1,3 @@
 <div xmlns:th="http://www.thymeleaf.org">
-  <section class="jumbotron text-center">
-    <div class="container">
-      <h1 class="jumbotron-heading">WEB PROGRAMMING SHOP</h1>
-      <h3 class="jumbotron-heading">All products</h3>
-    </div>
-  </section>
 
   <div class="container mb-4">
@@ -35,4 +29,19 @@
       </p>
 
+      <p sec:authorize="hasRole('ROLE_ADMIN')">
+        <label for="vrabotenType" class="sr-only">Vraboten Type</label>
+        <select name="vrabotenType" id="vrabotenType">
+          <option th:each="type : ${types}"
+                  th:text="${type.name()}"
+                  th:value="${type}" ></option>
+        </select>
+      </p>
+
+      <p sec:authorize="hasRole('ROLE_ADMIN')">
+        <label for="salary" class="sr-only">Salary</label>
+        <input type="number" id="salary" name="salary">
+      </p>
+
+
 
 
