Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java	(revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9)
@@ -38,5 +38,5 @@
             throw new InvalidArgumentsException();
         }
-        return Optional.of(articlesRepository.save(new Articles(description, articlename, maxquantityperlocation)));
+        return Optional.of(articlesRepository.saveAndFlush(new Articles(description, articlename, maxquantityperlocation)));
     }
 
@@ -48,5 +48,5 @@
             throw new InvalidArgumentsException();
         }
-        return Optional.of(articlesRepository.save(new Articles(description, articlename, imageurl, maxquantityperlocation)));
+        return Optional.of(articlesRepository.saveAndFlush(new Articles(description, articlename, imageurl, maxquantityperlocation)));
     }
 
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/WorkersServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/WorkersServiceImpl.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/WorkersServiceImpl.java	(revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9)
@@ -9,4 +9,5 @@
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Optional;
 
@@ -26,5 +27,10 @@
         Locations location=locationsRepository.findById(locationId).orElseThrow(InvalidArgumentsException::new);
         worker.setLocation(location);
-        return Optional.of(worker);
+        return Optional.of(workersRepository.save(worker));
+    }
+
+    @Override
+    public List<Workers> findAllWithNoLocation() {
+        return workersRepository.findAllByLocationIsNull();
     }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/WorkersService.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/WorkersService.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/WorkersService.java	(revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9)
@@ -6,3 +6,4 @@
 public interface WorkersService {
     Optional<Workers> assignLocation(Integer workerId, Integer locationId);
+    List<Workers> findAllWithNoLocation();
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ManagerController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ManagerController.java	(revision f7b963fcbe6e9c2c03601db2bf3526e1efc31188)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ManagerController.java	(revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9)
@@ -1,11 +1,24 @@
 package com.bazi.fullystocked.Web.Controller;
 
+import com.bazi.fullystocked.Services.LocationsService;
+import com.bazi.fullystocked.Services.WorkersService;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 @RequestMapping(value ="/manager")
 public class ManagerController {
+    private final WorkersService workersService;
+    private final LocationsService locationsService;
+
+    public ManagerController(WorkersService workersService, LocationsService locationsService) {
+        this.workersService = workersService;
+        this.locationsService = locationsService;
+    }
+
     @GetMapping
     public String getManagerPage()
@@ -14,3 +27,23 @@
         return "homeManager";
     }
+
+    @GetMapping("/noLocWorkers")
+    public String listWorkersWithNullLocation(Model model)
+    {
+        model.addAttribute("workers", workersService.findAllWithNoLocation());
+        model.addAttribute("locations", locationsService.findAll());
+        return "noLocWorkers";
+    }
+    @PostMapping("/noLocWorkers/add")
+    public String addWorkerToLocation(@RequestParam Integer workerId, @RequestParam Integer locationId)
+    {
+        try{
+            workersService.assignLocation(workerId, locationId);
+            return "redirect:/manager/noLocWorkers";
+        }
+        catch (Exception e)
+        {
+            return "redirect:/manager/noLocWorkers?error="+e.getMessage();
+        }
+    }
 }
Index: FullyStocked/src/main/resources/templates/noLocWorkers.html
===================================================================
--- FullyStocked/src/main/resources/templates/noLocWorkers.html	(revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9)
+++ FullyStocked/src/main/resources/templates/noLocWorkers.html	(revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9)
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+  <meta charset="UTF-8">
+  <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+  <div class="container">
+    <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</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>
+
+    <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="/questions/manager/list">Одговори прашање</a>
+        </li>
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="/orders/create">Креирај нарчка</a>
+        </li>
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
+        </li>
+      </ul>
+
+      <ul class="nav navbar-nav navbar-right">
+
+        <li class="nav-item">
+          <a class="btn btn-light btn-sm ml-3" href="/logout">
+            <i class="fa fa-shopping-cart"></i> Logout
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav>
+<div class="d-flex justify-content-center">
+  <h2 class="m-2">Избери артикл</h2>
+</div>
+<table class="table">
+  <thead>
+  <tr>
+    <th>
+
+    </th>
+    <th>
+      Корисничко име
+    </th>
+    <th>
+      Име
+    </th>
+    <th>
+      Презиме
+    </th>
+    <th>
+
+    </th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr th:each="w : ${workers}">
+    <td></td>
+    <td th:text="${w.getUsername()}" class="link">
+    </td>
+    <td th:text="${w.getFirstname()}" class="link">
+    </td>
+    <td th:text="${w.getLastname()}" class="link">
+    </td>
+    <td>
+      <form action="/manager/noLocWorkers/add" th:method="POST">
+        <input type="hidden" th:value="${w.getUserid()}" name="workerId">
+        <div class="row">
+          <div class="col-md-6">
+            <select name="locationId" class="form-control">
+              <option th:each="l:${locations}" th:value="${l.getLocationid()}" th:text="${l.getLocationname()}"></option>
+            </select>
+          </div>
+          <div class="col-md-6">
+            <button class="btn btn-primary" >Додади</button>
+          </div>
+        </div>
+      </form>
+
+    </td>
+
+  </tr>
+  </tbody>
+</table>
+<style>
+  .link {
+    font-size: 20px;
+  }
+
+  .link1 {
+    font-size: 18px;
+  }
+
+  th {
+    font-size: 16px;
+  }
+
+</style>
+</body>
+</html>