Index: src/main/resources/templates/filteredParts.html
===================================================================
--- src/main/resources/templates/filteredParts.html	(revision d4b888e8c58f07ca9c34c64e3184cceecd9b65a8)
+++ src/main/resources/templates/filteredParts.html	(revision 9dcbf444a75f533d0d8f1bfbf8d0603e8dea6f85)
@@ -1,12 +1,13 @@
 <div>
-<h1>Резултат од филтерот</h1>
+<h1 class="mt-3 mb-3">Резултат од филтерот</h1>
 <a th:href="${'/products'}">Врати се на сите производи</a>
-
-<table>
-    <thead>
+    <h3 th:if="${hasError}" th:text="${error}"></h3>
+    <div th:if="${!hasError}">
+<table class="table table-bordered mt-3">
+    <thead class="thead-dark">
     <tr>
-        <th>Name</th>
-        <th>Manufacturer</th>
-        <th>Details</th>
+        <th scope="col">Име</th>
+        <th scope="col">Производител</th>
+        <th scope="col">Детали</th>
     </tr>
     </thead>
@@ -17,5 +18,5 @@
         <td>
             <form th:action="@{'/part/{id}' (id=${f.getPartid()}) }">
-                <button type="submit">Детали</button>
+                <button class="btn btn-primary btn-block btn-lg w-50" type="submit">Детали</button>
             </form>
         </td>
@@ -23,4 +24,4 @@
     </tbody>
 </table>
-
+    </div>
 </div>
Index: src/main/resources/templates/myDeliveries.html
===================================================================
--- src/main/resources/templates/myDeliveries.html	(revision d4b888e8c58f07ca9c34c64e3184cceecd9b65a8)
+++ src/main/resources/templates/myDeliveries.html	(revision 9dcbf444a75f533d0d8f1bfbf8d0603e8dea6f85)
@@ -1,4 +1,7 @@
 <div>
     <h1>Мои достави</h1>
+    <form class="form-signin mt-xl-5" method="get" action="/myNextDeliveries">
+    <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Мои следни нарачки</button>
+    </form>
     <table>
         <thead>
Index: src/main/resources/templates/myNextDeliveries.html
===================================================================
--- src/main/resources/templates/myNextDeliveries.html	(revision 9dcbf444a75f533d0d8f1bfbf8d0603e8dea6f85)
+++ src/main/resources/templates/myNextDeliveries.html	(revision 9dcbf444a75f533d0d8f1bfbf8d0603e8dea6f85)
@@ -0,0 +1,30 @@
+<div>
+  <h1>Мои следни нарачки</h1>
+  <h1 th:if="${hasError}" th:text="${error}"></h1>
+  <div th:if="${!hasError}">
+  <table>
+    <thead>
+    <tr>
+      <th>Статус на достава</th>
+      <th>Адреса на достава</th>
+      <th>Број на нарачка</th>
+      <th>Датум на нарачка</th>
+      <th>Детали за нарачка</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="d : ${deliveries}">
+      <td th:text="${d.getStatus}"></td>
+      <td th:text="${d.getAddress()}"></td>
+      <td th:text="${d.getOrderid()}"></td>
+      <td th:text="${d.getDatum()}"></td>
+      <td>
+        <form method="get" th:action="@{'/order/{id}' (id=${d.getOrderid()}) }">
+          <button class="btn btn-primary btn-block btn-lg" type="submit">Детали</button>
+        </form>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+  </div>
+</div>
Index: src/main/resources/templates/orderInfo.html
===================================================================
--- src/main/resources/templates/orderInfo.html	(revision 9dcbf444a75f533d0d8f1bfbf8d0603e8dea6f85)
+++ src/main/resources/templates/orderInfo.html	(revision 9dcbf444a75f533d0d8f1bfbf8d0603e8dea6f85)
@@ -0,0 +1,22 @@
+<div>
+  <h1>Нарачка број <span th:text="${o.getOrderid()}"></span></h1>
+  <table>
+    <thead>
+    <tr>
+      <th>Име на делот</th>
+      <th>Количина</th>
+      <th>Производител на делот</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="p : ${parts}">
+      <td th:text="${p.getPartname}"></td>
+      <td th:text="${p.getQuantity()}"></td>
+      <td th:text="${p.getManufacturername()}"></td>
+    </tr>
+    </tbody>
+  </table>
+  <form method="post" th:action="@{'/finishDelivery/{id}' (id=${o.getOrderid()}) }">
+    <button class="btn btn-primary btn-block btn-lg" type="submit">Заврши достава</button>
+  </form>
+</div>
Index: src/main/resources/templates/partinfo.html
===================================================================
--- src/main/resources/templates/partinfo.html	(revision d4b888e8c58f07ca9c34c64e3184cceecd9b65a8)
+++ src/main/resources/templates/partinfo.html	(revision 9dcbf444a75f533d0d8f1bfbf8d0603e8dea6f85)
@@ -1,12 +1,27 @@
 <div>
-<p th:text="${part.getName()}"></p>
-<p th:text="${part.getDescription()}"></p>
-<p th:text="${part.getManufacturer().getName()}"></p>
-<p><span th:text="${amount}"></span><span> денари</span></p>
+    <table class="table table-bordered mt-4">
+        <thead class="thead-dark">
+        <tr>
+            <th scope="col">Име</th>
+            <th scope="col">Опис</th>
+            <th scope="col">Производител</th>
+            <th scope="col">Цена</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            <td th:text="${part.getName()}"></td>
+            <td th:text="${part.getDescription()}"></td>
+            <td th:text="${part.getManufacturer().getName()}"></td>
+            <td><span th:text="${amount}"></span><span> денари</span></td>
+        </tr>
+        </tbody>
+    </table>
+
 <form method="post" th:action="@{'/part/addToOrder/{id}' (id=${part.getId()}) }">
     <label>
-        <input type="number" name="quantity" required min="1" placeholder="Количина"/>
+        <input class="form-control d-inline" type="number" name="quantity" required min="1" placeholder="Количина"/>
     </label>
-    <button class="btn btn-primary btn-block btn-lg" type="submit">Додај во нарачка</button>
+    <button class="btn btn-primary btn-block btn-lg w-25 d-inline" type="submit">Додај во нарачка</button>
 </form>
 </div>
Index: src/main/resources/templates/products.html
===================================================================
--- src/main/resources/templates/products.html	(revision d4b888e8c58f07ca9c34c64e3184cceecd9b65a8)
+++ src/main/resources/templates/products.html	(revision 9dcbf444a75f533d0d8f1bfbf8d0603e8dea6f85)
@@ -9,7 +9,7 @@
 </header>
 <main>
-    <h1>Сите производи</h1>
+    <h1 class="mt-3 mb-3">Сите производи</h1>
     <form th:action="@{/filtered}">
-        <label for="cartype"></label><select id="cartype" required name="cartype">
+        <label for="cartype"></label><select id="cartype" class="form-control w-25 d-inline mr-3" required name="cartype">
             <option  th:each="car : ${cars}"
                      th:text="${car.getCartype()}"
@@ -17,5 +17,5 @@
             </option>
         </select>
-        <label for="category"></label><select id="category" required name="category">
+        <label for="category"></label><select id="category" class="form-control w-25 d-inline mr-3" required name="category">
             <option  th:each="cat : ${categories}"
                      th:text="${cat.getCname()}"
@@ -23,12 +23,12 @@
             </option>
         </select>
-        <button type="submit">Филтрирај</button>
+        <button class="btn btn-lg btn-block btn-primary w-25 d-inline" type="submit">Филтрирај</button>
     </form>
-    <table>
-        <thead>
+    <table class="table table-bordered mt-4">
+        <thead class="thead-dark">
         <tr>
-            <th>Name</th>
-            <th>Manufacturer</th>
-            <th>Details</th>
+            <th scope="col">Име</th>
+            <th scope="col">Производител</th>
+            <th scope="col">Детали</th>
         </tr>
         </thead>
@@ -39,5 +39,5 @@
             <td>
                 <form th:action="@{'/part/{id}' (id=${part.getId()}) }">
-                    <button type="submit">Детали</button>
+                    <button class="btn btn-primary btn-block btn-lg w-50" type="submit">Детали</button>
                 </form>
             </td>
Index: src/main/resources/templates/services.html
===================================================================
--- src/main/resources/templates/services.html	(revision d4b888e8c58f07ca9c34c64e3184cceecd9b65a8)
+++ src/main/resources/templates/services.html	(revision 9dcbf444a75f533d0d8f1bfbf8d0603e8dea6f85)
@@ -1,11 +1,11 @@
 <div>
   <main>
-    <h1>Информации за сервиси</h1>
-    <table>
-      <thead>
+    <h1 class="mt-3 mb-3">Информации за сервиси</h1>
+    <table class="table table-bordered">
+      <thead class="thead-dark">
       <tr>
-        <th>Name</th>
-        <th>Number of reviews</th>
-        <th>Average rating</th>
+        <th scope="col">Име на сервис</th>
+        <th scope="col">Број на критики</th>
+        <th scope="col">Просечна оценка</th>
       </tr>
       </thead>
