Index: src/main/resources/templates/addCarSampleForUser.html
===================================================================
--- src/main/resources/templates/addCarSampleForUser.html	(revision f484b14ac6839719d4237822f088e088abec9846)
+++ src/main/resources/templates/addCarSampleForUser.html	(revision f484b14ac6839719d4237822f088e088abec9846)
@@ -0,0 +1,45 @@
+<div>
+  <form class="form-signin mt-xl-5" method="post" action="/addCarSampleForUser">
+    <h2 class="form-signin-heading">Додај ја својата кола</h2>
+    <p>
+      <label for="vin" class="sr-only">Број на шасија</label>
+      <input type="number" id="vin" name="vin" class="form-control" placeholder="Внеси го бројот на шасија" required="" autofocus=""/>
+    </p>
+    <p>
+      <label for="year" class="sr-only">Година на производство</label>
+      <input type="number" id="year" name="year" class="form-control" placeholder="Внеси ја годината на производство" required="" autofocus=""/>
+    </p>
+    <p>
+      <label for="power" class="sr-only">Јачина на мотор</label>
+      <input type="number" id="power" name="power" class="form-control" placeholder="Внеси јачина на мотор" required="" autofocus=""/>
+    </p>
+    <p>
+      <label for="displacement" class="sr-only">Зафатнина</label>
+      <input type="number" id="displacement" name="displacement" class="form-control" placeholder="Внеси зафатнина" required=""/>
+    </p>
+    <p>
+      <label for="fuel" class="sr-only">
+        Одбери тип на гориво
+      </label><select class="form-control" id="fuel" name="fuel" required>
+      <option value="Petrol">Petrol</option>
+      <option value="Diesel">Diesel</option>
+      <option value="Petrol/Gas">Petrol/Gas</option>
+    </select>
+    </p>
+    <p>
+      <label for="km" class="sr-only">Поминати километри</label>
+      <input type="number" id="km" name="km" class="form-control" placeholder="Додај поминати километри.." required=""/>
+    </p>
+    <p>
+      <label for="cartype" class="sr-only">
+        Одбери од кој тип на кола
+      </label><select class="form-control" id="cartype" name="cartype" required>
+      <option  th:each="car : ${cars}"
+               th:text="${car.getCartype()}"
+               th:value="${car.getId()}">
+      </option>
+    </select>
+    </p>
+    <button class="btn btn-lg btn-primary btn-block" type="submit">Додај кола</button>
+  </form>
+</div>
Index: src/main/resources/templates/chooseRepairShop.html
===================================================================
--- src/main/resources/templates/chooseRepairShop.html	(revision f484b14ac6839719d4237822f088e088abec9846)
+++ src/main/resources/templates/chooseRepairShop.html	(revision f484b14ac6839719d4237822f088e088abec9846)
@@ -0,0 +1,18 @@
+<div>
+  <h1 th:if="${hasError}" th:text="${error}"></h1>
+  <div th:if="${!hasError}">
+  <h3>Достава до овластен сервис</h3>
+  <form class="form-signin mt-xl-5" method="post" action="/part/chooseRepairShop">
+    <p>
+      <label for="rs" class="sr-only">Избор на сервис</label>
+      <select id="rs" required name="rs">
+        <option  th:each="aut : ${authorized}"
+                 th:text="${aut.getName()}"
+                 th:value="${aut.getId()}">
+        </option>
+      </select>
+    </p>
+    <button class="btn btn-lg btn-primary btn-block" type="submit">Достава до сервис</button>
+  </form>
+  </div>
+</div>
Index: src/main/resources/templates/deliveryForPart.html
===================================================================
--- src/main/resources/templates/deliveryForPart.html	(revision 1bd8d1ecea6caeb46112d4e4b23379b6bbd9ce31)
+++ src/main/resources/templates/deliveryForPart.html	(revision f484b14ac6839719d4237822f088e088abec9846)
@@ -13,16 +13,20 @@
   </form>
   <h3>Достава до овластен сервис</h3>
+  <h1 th:if="${hasError}" th:text="${error}"></h1>
+  <div th:if="${!hasError}">
   <form class="form-signin mt-xl-5" method="post" action="/part/repairshopdelivery">
     <p>
-      <label for="repairShop" class="sr-only">Избор на овластен сервис</label>
-      <select id="repairShop" required name="name">
-        <option  th:each="rs : ${repairShops}"
-                 th:text="${rs.getName()}"
-                 th:value="${rs.getId()}">
+      <span>Избор на некоја од твоите коли</span>
+      <label for="vin" class="sr-only">Избор на некоја од твоите коли</label>
+      <select id="vin" required name="vin">
+        <option  th:each="car : ${cars}"
+                 th:text="${car.getCar().getCartype()}"
+                 th:value="${car.getVin()}">
         </option>
       </select>
     </p>
-    <button class="btn btn-lg btn-primary btn-block" type="submit">Достава до сервис</button>
+    <button class="btn btn-lg btn-primary btn-block" type="submit">Следно</button>
   </form>
+  </div>
 </main>
 
Index: src/main/resources/templates/fragments/header.html
===================================================================
--- src/main/resources/templates/fragments/header.html	(revision 1bd8d1ecea6caeb46112d4e4b23379b6bbd9ce31)
+++ src/main/resources/templates/fragments/header.html	(revision f484b14ac6839719d4237822f088e088abec9846)
@@ -20,4 +20,9 @@
             <a class="nav-link active" href="/currentOrder">Моја нарачка</a>
           </li>
+          </th:block>
+          <th:block sec:authorize="hasAuthority('ROLE_CLIENT')">
+            <li class="nav-item m-auto">
+              <a class="nav-link active" href="/addCarSampleForUser">Додај примерок од кола</a>
+            </li>
           </th:block>
           <th:block sec:authorize="hasAuthority('ROLE_WAREHOUSEMAN')">
