Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -3,5 +3,4 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
@@ -13,9 +12,9 @@
     private Long id;
     private LocalDate dateCreated;
-    private LocalDate deliveryDate;
+    private LocalDate delDate;
     private Integer delStartKm;
     private Integer delEndKm;
     private LocalTime delStartTime;
-    private LocalTime deliveryEndTime;
+    private LocalTime delEndTime;
     private Short dStatusId;
     private String delStatus;
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrdersDto.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrdersDto.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/OrdersDto.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -13,5 +13,5 @@
     private LocalDate ordDate;
     private Integer ordSum;
-    private LocalDateTime orderFulfillmentDate;
+    private LocalDateTime ordFulfillmentDate;
     private String ordComment;
     private Short oStatusId;
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WarehouseInventoryDto.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WarehouseInventoryDto.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/WarehouseInventoryDto.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -0,0 +1,12 @@
+package mk.ukim.finki.db.distributorapp.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class WarehouseInventoryDto {
+    String articleName;
+    String manufacturerName;
+    Integer totalUnits;
+}
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -2,4 +2,5 @@
 
 import lombok.NonNull;
+import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Delivery;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -115,5 +116,17 @@
             nativeQuery = true,
             value = """
-                    select d.*
+                    select d.del_id as id,
+                           d.del_date_created as dateCreated,
+                           d.del_date as deliveryDate,
+                           d.del_start_km as delStartKm,
+                           d.del_end_km as delEndKm,
+                           d.del_start_time as delStartTime,
+                           d.del_end_time as delEndTime,
+                           d.d_status_id as dStatusId,
+                           ds.d_status_name as delStatus,
+                           v.veh_id as vehId,
+                           dr.user_id as driverId,
+                           u.user_name as driverName,
+                           u.user_image as driverImage
                     from warehouse w
                         join manager m on w.wh_id = m.wh_id
@@ -121,7 +134,11 @@
                         join orders o on au.ord_id = o.ord_id
                         join delivery d on o.del_id = d.del_id
+                        join delivery_status ds on d.d_status_id=ds.d_status_id
+                        join vehicle v on v.veh_id=d.veh_id
+                        join driver dr on dr.veh_id=v.veh_id
+                        join users u on u.user_id=dr.user_id
                     where m.user_id=:manager and d.d_status_id<>4
                     """
     )
-    List<Delivery> getCurrentDeliveriesByManager(@NonNull @Param("manager") Long manager_id);
+    List<DeliveryDto> getCurrentDeliveriesByManager(@NonNull @Param("manager") Long manager_id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -2,4 +2,5 @@
 
 import lombok.NonNull;
+import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Orders;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -93,9 +94,31 @@
             nativeQuery = true,
             value = """
-                    select o.*
+                    select o.ord_id as id,
+                           o.ord_date as ordDate,
+                           o.ord_sum as ordSum,
+                           o.ord_fulfillment_date as ordFulfillmentDate,
+                           o.ord_comment as ordComment,
+                           o.o_status_id as oStatusId,
+                           os.o_status_name as statusName,
+                           c.user_id as customerId,
+                           c.cust_company_name as customerName,
+                           u.user_mobile as customerPhone,
+                           u.user_email as customerEmail,
+                           null as deliveryid,
+                           null as driverId,
+                           null as driverName,
+                           null as driverPhone,
+                           null as driverEmail,
+                           pf.pf_status_id as pfId,
+                           pfs.pf_status_name as pfStatus
                     from warehouse w
                         join manager m on w.wh_id= m.wh_id
                         join article_unit au on au.wh_id = w.wh_id
                         join orders o on au.ord_id = o.ord_id
+                        join order_status os on os.o_status_id = o.o_status_id
+                        join customer c on o.cust_id = c.user_id
+                        join users u on c.user_id = u.user_id
+                        join pro_forma pf on o.pf_id = pf.pf_id
+                        join pro_forma_status pfs on pf.pf_status_id=pfs.pf_status_id
                     where m.user_id = :manager
                       and o.o_status_id = 1
@@ -103,4 +126,4 @@
                     """
     )
-    List<Orders> getNewOrdersByManager(@NonNull @Param("manager") Long manager_id);
+    List<OrdersDto> getNewOrdersByManager(@NonNull @Param("manager") Long manager_id);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/VehicleRepository.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -3,4 +3,5 @@
 import lombok.NonNull;
 import mk.ukim.finki.db.distributorapp.model.dto.VehicleBasicDto;
+import mk.ukim.finki.db.distributorapp.model.dto.VehicleDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Vehicle;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -96,13 +97,34 @@
             nativeQuery = true,
             value = """
-                    select v.veh_plate,v.veh_reg
+                    select v.veh_id as id,
+                           v.veh_carry_weight as carryWeight,
+                           v.veh_service_interval as serviceInterval,
+                           v.veh_kilometers as kilometers,
+                           v.veh_last_service as lastServiceDate,
+                           v.veh_last_service_km as lastServiceKm,
+                           v.veh_plate as plate,
+                           v.veh_vin as vin,
+                           v.veh_reg as registrationDate,
+                           w.wh_id as whId,
+                           c.city_name as city,
+                           r.region_name as region,
+                           d.user_id as driverId,
+                           u1.user_name as driverName,
+                           u1.user_email as driverEmail,
+                           u1.user_mobile as driverPhone,
+                           u1.user_image as driverImg
                     from warehouse w
-                             join manager m on w.wh_id = m.wh_id
-                             join vehicle v on w.wh_id=v.wh_id
-                    where m.user_id=:manager
-                    group by v.veh_plate, v.veh_reg
+                    join city c on w.city_id = c.city_id
+                    join region r on c.region_id = r.region_id
+                    join manager m on w.wh_id = m.wh_id
+                    join users u on m.user_id = u.user_id
+                    join vehicle v on w.wh_id=v.wh_id
+                    join driver d on d.veh_id=v.veh_id
+                    join users u1 on d.user_id=u1.user_id
+                    where m.user_id = :manager
+                    group by v.veh_id, v.veh_carry_weight, v.veh_service_interval, v.veh_kilometers, v.veh_last_service, v.veh_last_service_km, v.veh_plate, v.veh_vin, v.veh_reg, w.wh_id, c.city_name, r.region_name, d.user_id, u1.user_name, u1.user_email, u1.user_mobile, u1.user_image
                     order by v.veh_reg
-                    """
+                   """
     )
-    List<Vehicle> getVehiclesByManager(@NonNull @Param("manager") Long managerId);
+    List<VehicleDto> getVehiclesByManager(@NonNull @Param("manager") Long managerId);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/WarehouseRepository.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -3,5 +3,5 @@
 import lombok.NonNull;
 import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto;
-import mk.ukim.finki.db.distributorapp.model.entities.ArticleUnit;
+import mk.ukim.finki.db.distributorapp.model.dto.WarehouseInventoryDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Warehouse;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -69,5 +69,7 @@
             nativeQuery = true,
             value = """
-                    select a.art_name, man.man_name, count(a.art_id) as total_units
+                    select a.art_name as articleName,
+                           man.man_name as manufacturerName,
+                           count(au.unit_id) as totalUnits
                     from warehouse w
                         join manager m on m.wh_id = w.wh_id
@@ -76,12 +78,11 @@
                         join price p on p.price_id=up.price_id
                         join article a on p.art_id=a.art_id
-                        join article a on au = a.art_id
                         join manufacturer man on a.man_id = man.man_id
                     where m.user_id = :manager
                     group by a.art_name, man.man_name
-                    order by total_units
+                    order by totalUnits
                     """
     )
-    List<ArticleUnit> getInventoryByManager(@NonNull @Param("manager") Long manager_id);
+    List<WarehouseInventoryDto> getInventoryByManager(@NonNull @Param("manager") Long manager_id);
 
     @Query(
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -4,5 +4,4 @@
 import mk.ukim.finki.db.distributorapp.model.entities.Customer;
 import mk.ukim.finki.db.distributorapp.model.entities.Driver;
-import mk.ukim.finki.db.distributorapp.model.entities.Manager;
 import mk.ukim.finki.db.distributorapp.model.entities.Vehicle;
 
@@ -28,4 +27,4 @@
     List<DeliveryDto> getCurrentDeliveriesByCustomer (Customer customer);
 
-    List<DeliveryDto> getCurrentDeliveriesByManager (Manager manager);
+    List<DeliveryDto> getCurrentDeliveriesByManager (Long managerId);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Customer;
-import mk.ukim.finki.db.distributorapp.model.entities.Manager;
 
 import java.util.List;
@@ -22,4 +21,4 @@
     List<OrdersDto> findCurrentOrdersByCustomer(Customer customer);
 
-    List<OrdersDto> getNewOrdersByManager(Manager manager);
+    List<OrdersDto> getNewOrdersByManager(Long managerId);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/VehicleService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/VehicleService.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/VehicleService.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -3,5 +3,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.VehicleBasicDto;
 import mk.ukim.finki.db.distributorapp.model.dto.VehicleDto;
-import mk.ukim.finki.db.distributorapp.model.entities.Manager;
 
 import java.util.List;
@@ -19,4 +18,4 @@
     void deleteById(Integer id);
 
-    List<VehicleDto> getVehiclesByManager(Manager manager);
+    List<VehicleDto> getVehiclesByManager(Long managerId);
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/WarehouseService.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -2,6 +2,6 @@
 
 import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto;
+import mk.ukim.finki.db.distributorapp.model.dto.WarehouseInventoryDto;
 import mk.ukim.finki.db.distributorapp.model.entities.City;
-import mk.ukim.finki.db.distributorapp.model.entities.Manager;
 
 import java.util.List;
@@ -22,5 +22,5 @@
     void deleteById(Integer id);
 
-    List<WarehouseDto> getInventoryByManager(Manager manager);
+    List<WarehouseInventoryDto> getInventoryByManager(Long managerId);
 
     
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -81,9 +81,9 @@
         return this.deliveryRepository.create(
                 deliveryDto.getDateCreated(),
-                deliveryDto.getDeliveryDate(),
+                deliveryDto.getDelDate(),
                 deliveryDto.getDelStartKm(),
                 deliveryDto.getDelEndKm(),
                 deliveryDto.getDelStartTime(),
-                deliveryDto.getDeliveryEndTime(),
+                deliveryDto.getDelEndTime(),
                 deliveryDto.getDStatusId(),
                 deliveryDto.getVehId()
@@ -96,9 +96,9 @@
                 deliveryDto.getId(),
                 deliveryDto.getDateCreated(),
-                deliveryDto.getDeliveryDate(),
+                deliveryDto.getDelDate(),
                 deliveryDto.getDelStartKm(),
                 deliveryDto.getDelEndKm(),
                 deliveryDto.getDelStartTime(),
-                deliveryDto.getDeliveryEndTime(),
+                deliveryDto.getDelEndTime(),
                 deliveryDto.getDStatusId(),
                 deliveryDto.getVehId()
@@ -124,7 +124,6 @@
 
     @Override
-    public List<DeliveryDto> getCurrentDeliveriesByManager(Manager manager) {
-        List<Delivery> deliveries = this.deliveryRepository.getCurrentDeliveriesByManager(manager.getUserId());
-        return buildDto(deliveries);
+    public List<DeliveryDto> getCurrentDeliveriesByManager(Long managerId) {
+        return this.deliveryRepository.getCurrentDeliveriesByManager(managerId);
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -4,5 +4,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.OrdersDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Customer;
-import mk.ukim.finki.db.distributorapp.model.entities.Manager;
 import mk.ukim.finki.db.distributorapp.model.entities.Orders;
 import mk.ukim.finki.db.distributorapp.repository.OrdersRepository;
@@ -89,5 +88,5 @@
                 ordersDto.getOrdDate(),
                 ordersDto.getOrdSum(),
-                ordersDto.getOrderFulfillmentDate(),
+                ordersDto.getOrdFulfillmentDate(),
                 ordersDto.getOrdComment(),
                 ordersDto.getOStatusId(),
@@ -104,5 +103,5 @@
                 ordersDto.getOrdDate(),
                 ordersDto.getOrdSum(),
-                ordersDto.getOrderFulfillmentDate(),
+                ordersDto.getOrdFulfillmentDate(),
                 ordersDto.getOrdComment(),
                 ordersDto.getOStatusId(),
@@ -125,7 +124,6 @@
 
     @Override
-    public List<OrdersDto> getNewOrdersByManager(Manager manager) {
-        List<Orders> orders = this.ordersRepository.getNewOrdersByManager(manager.getUserId());
-        return buildDto(orders);
+    public List<OrdersDto> getNewOrdersByManager(Long managerId) {
+         return this.ordersRepository.getNewOrdersByManager(managerId);
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/VehicleServiceImpl.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -4,5 +4,4 @@
 import mk.ukim.finki.db.distributorapp.model.dto.VehicleBasicDto;
 import mk.ukim.finki.db.distributorapp.model.dto.VehicleDto;
-import mk.ukim.finki.db.distributorapp.model.entities.Manager;
 import mk.ukim.finki.db.distributorapp.model.entities.Vehicle;
 import mk.ukim.finki.db.distributorapp.repository.VehicleRepository;
@@ -99,7 +98,6 @@
 
     @Override
-    public List<VehicleDto> getVehiclesByManager(Manager manager) {
-        List<Vehicle> vehicles = this.vehicleRepository.getVehiclesByManager(manager.getUserId());
-        return buildDtoList(vehicles);
+    public List<VehicleDto> getVehiclesByManager(Long managerId) {
+        return this.vehicleRepository.getVehiclesByManager(managerId);
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/WarehouseServiceImpl.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -2,7 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
+import mk.ukim.finki.db.distributorapp.model.dto.ArticleUnitDto;
 import mk.ukim.finki.db.distributorapp.model.dto.WarehouseDto;
+import mk.ukim.finki.db.distributorapp.model.dto.WarehouseInventoryDto;
 import mk.ukim.finki.db.distributorapp.model.entities.City;
-import mk.ukim.finki.db.distributorapp.model.entities.Manager;
 import mk.ukim.finki.db.distributorapp.model.entities.Warehouse;
 import mk.ukim.finki.db.distributorapp.repository.WarehouseRepository;
@@ -87,6 +88,6 @@
 
     @Override
-    public List<WarehouseDto> getInventoryByManager(Manager manager) {
-        return List.of();
+    public List<WarehouseInventoryDto> getInventoryByManager(Long managerId) {
+        return this.warehouseRepository.getInventoryByManager(managerId);
     }
 }
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/ManagerController.java	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -25,13 +25,14 @@
 
     @GetMapping({"/dashboard","/"})
-    public String dashboard() {
+    public String dashboard(Model model) {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         String userEmail = authentication.getName();
         UserDto user = this.usersService.findUserDtoByEmail(userEmail);
 
-//        model.addAttribute("currentInventory", warehouseService.getInventoryByManager(manager.getId()));
-//        model.addAttribute("vehicleStatus", vehicleService.getVehiclesByManager(manager.getId()));
-//        model.addAttribute("newOrders", ordersService.getNewOrdersByManager(manager.getId()));
-//        model.addAttribute("currentDeliveries", deliveryService.getCurrentDeliveriesByManager(manager.getId()));
+        model.addAttribute("user", user);
+        model.addAttribute("currentInventory", warehouseService.getInventoryByManager(user.getId()));
+        model.addAttribute("vehicleStatus", vehicleService.getVehiclesByManager(user.getId()));
+        model.addAttribute("newOrders", ordersService.getNewOrdersByManager(user.getId()));
+        model.addAttribute("currentDeliveries", deliveryService.getCurrentDeliveriesByManager(user.getId()));
         return "home/manager";
     }
Index: backend/src/main/resources/templates/home/manager.html
===================================================================
--- backend/src/main/resources/templates/home/manager.html	(revision c623baa5f39310c5b9da3fa4ac144b1f9aa2fec1)
+++ backend/src/main/resources/templates/home/manager.html	(revision c2c10df9fb9e08514602b58e086d386b97145ed8)
@@ -10,6 +10,87 @@
 
 <div class="container mt-4">
-    <h1>Welcome to the Home Page</h1>
-    <p th:text="'Hello, ' + ${userType} + '!'"></p>
+    <h1 th:text="'Here is your dashboard '+${user.getFirstName()}"></h1>
+    <div class="row">
+        <div class="col-md-6">
+            <h2> Current inventory</h2>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>Article</th>
+                    <th>Manufacturer</th>
+                    <th>Quantity</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr th:each="inventory : ${currentInventory}">
+                    <td th:text="${inventory.getArticleName()}"></td>
+                    <td th:text="${inventory.getManufacturerName()}"></td>
+                    <td th:text="${inventory.getTotalUnits()}"></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+        <div class="col-md-6">
+            <h2>Vehicle Status</h2>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>Vehicle plate</th>
+                    <th>Registration Date</th>
+                    <th>Driver Name</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr th:each="vehicle : ${vehicleStatus}">
+                    <td th:text="${vehicle.getPlate()}"></td>
+                    <td th:text="${vehicle.getRegistrationDate()}"></td>
+                    <td th:text="${vehicle.getDriverName()}"></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div class="row mt-4">
+        <div class="col-md-6">
+            <h2>New Orders</h2>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>Customer</th>
+                    <th>Order Date</th>
+                    <th>Order Sum</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr th:each="order : ${newOrders}">
+                    <td th:text="${order.getCustomerName()}"></td>
+                    <td th:text="${order.getOrdDate()}"></td>
+                    <td th:text="${order.getOrdSum()}"></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <div class="col-md-6">
+            <h2>Current Deliveries</h2>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>Delivery Driver</th>
+                    <th>Delivery Start Time</th>
+                    <th>Delivery Status</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr th:each="delivery : ${currentDeliveries}">
+                    <td th:text="${delivery.getDriverName()}"></td>
+                    <td th:text="${delivery.getDelStartTime()}"></td>
+                    <td th:text="${delivery.getDelStatus()}"></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
 </div>