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 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java	(revision f7ad420eba0ae27b05bbff3f892e5fd48a4f4504)
@@ -25,5 +25,5 @@
             nativeQuery = true,
             value = "select * from delivery " +
-                    "where veh_id=?1"
+                    "where veh_id = ?1"
     )
     List<Delivery> findAllByVehicle(@NonNull Integer veh_id);
@@ -31,5 +31,5 @@
     @Query(
             nativeQuery = true,
-            value = "select * from delivery where del_id=?1"
+            value = "select * from delivery where del_id = ?1"
     )
     Optional<Delivery> findById(@NonNull Long id);
@@ -40,5 +40,5 @@
                     "from delivery d join vehicle v on d.veh_id = v.veh_id " +
                     "join driver dr on v.veh_id = dr.veh_id " +
-                    "where dr.user_id=?1"
+                    "where dr.user_id = ?1"
     )
     List<Delivery> findDeliveriesByDriver(@NonNull Long driver_id);
@@ -48,5 +48,5 @@
     @Query(
             nativeQuery = true,
-            value = "insert into delivery(del_date_created, del_date, del_start_km, del_end_km, del_start_time, del_end_time, del_status_id, veh_id) " +
+            value = "insert into delivery(del_date_created, del_date, del_start_km, del_end_km, del_start_time, del_end_time, d_status_id, veh_id) " +
                     "values (?1,?2,?3,?4,?5,?6,?7,?8)"
     )
@@ -67,6 +67,6 @@
             nativeQuery = true,
             value = "update delivery " +
-                    "set del_date_created=?2,del_date=?3,del_start_km=?4,del_end_km=?5,del_start_time=?6,del_end_time=?7,del_status_id=?8,veh_id=?9 " +
-                    "where del_id=?1"
+                    "set del_date_created = ?2,del_date = ?3,del_start_km = ?4,del_end_km = ?5,del_start_time = ?6,del_end_time = ?7,d_status_id = ?8,veh_id = ?9 " +
+                    "where del_id = ?1"
     )
     Integer edit(
@@ -86,5 +86,5 @@
     @Query(
             nativeQuery = true,
-            value = "delete from delivery where del_id=?1"
+            value = "delete from delivery where del_id = ?1"
     )
     void delete(@NonNull Long id);
@@ -106,10 +106,28 @@
             nativeQuery = true,
             value = """
-                    select d.*
-                    from delivery d join orders o on o.del_id=d.del_id
-                    where o.cust_id=:customer and d.d_status_id <> 4;
+                    select del.del_id as id,
+                           del.del_date_created as dateCreated,
+                           del.del_date as deliveryDate,
+                           del.del_start_km as delStartKm,
+                           del.del_end_km as delEndKm,
+                           del.del_start_time as delStartTime,
+                           del.del_end_time as delEndTime,
+                           del.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 delivery del
+                        join orders o on o.del_id=del.del_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 o.cust_id=:customer and del.d_status_id <> 4;
                     """
     )
-    List<Delivery> getCurrentDeliveriesByCustomer(@NonNull @Param("customer") Long customer_id);
+    List<DeliveryDto> getCurrentDeliveriesByCustomer(@NonNull @Param("customer") Long customer_id);
 
     @Query(
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 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/OrdersRepository.java	(revision f7ad420eba0ae27b05bbff3f892e5fd48a4f4504)
@@ -38,5 +38,5 @@
     @Query(
             nativeQuery = true,
-            value = "insert into orders (ord_date, ord_sum, ord_fulfillment_date, ord_comment, ord_status_id, cust_id, del_id, pf_id) " +
+            value = "insert into orders (ord_date, ord_sum, ord_fulfillment_date, ord_comment, o_status_id, cust_id, del_id, pf_id) " +
                     "values (?1,?2,?3,?4,?5,?6,?7,?8)"
     )
@@ -57,5 +57,5 @@
             nativeQuery = true,
             value = "update orders " +
-                    "set ord_date=?2,ord_sum=?3,ord_fulfillment_date=?4,ord_comment=?5,ord_status_id=?6,cust_id=?7,del_id=?8,pf_id=?9 " +
+                    "set ord_date=?2,ord_sum=?3,ord_fulfillment_date=?4,ord_comment=?5,o_status_id=?6,cust_id=?7,del_id=?8,pf_id=?9 " +
                     "where ord_id=?1"
     )
@@ -84,10 +84,36 @@
             nativeQuery = true,
             value = """
-                    select *
+                    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,
+                           o.cust_id as customerId,
+                           c.cust_company_name as customerName,
+                           u.user_mobile as customerPhone,
+                           u.user_email as customerEmail,
+                           o.del_id as deliveryId,
+                           d.user_id as driverId,
+                           u1.user_name as driverName,
+                           u1.user_mobile as driverPhone,
+                           u1.user_email as driverEmail,
+                           o.pf_id as pfId,
+                           pfs.pf_status_name as pfStatus
                     from orders o
+                    join order_status os on o.o_status_id = os.o_status_id
+                    join customer c on c.user_id=o.cust_id
+                    join users u on c.user_id=u.user_id
+                    join delivery del on o.del_id = del.del_id
+                    join vehicle v on del.veh_id = v.veh_id
+                    join driver d on d.veh_id=v.veh_id
+                    join users u1 on d.user_id=u1.user_id
+                    join pro_forma pf on o.pf_id = pf.pf_id
+                    join pro_forma_status pfs on pfs.pf_status_id=pf.pf_status_id
                     where o.cust_id=:customer and o.o_status_id between 2 and 6
                     """
     )
-    List<Orders> getCurrentOrdersByCustomer(@NonNull @Param("customer") Long customer_id);
+    List<OrdersDto> getCurrentOrdersByCustomer(@NonNull @Param("customer") Long customer_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 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java	(revision f7ad420eba0ae27b05bbff3f892e5fd48a4f4504)
@@ -2,5 +2,4 @@
 
 import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto;
-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.Vehicle;
@@ -23,5 +22,5 @@
     void deleteById(Long del_id);
 
-    List<DeliveryDto> getCurrentDeliveriesByCustomer (Customer customer);
+    List<DeliveryDto> getCurrentDeliveriesByCustomer (Long customerId);
 
     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 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/OrdersService.java	(revision f7ad420eba0ae27b05bbff3f892e5fd48a4f4504)
@@ -19,5 +19,5 @@
     void deleteById(Long id);
 
-    List<OrdersDto> findCurrentOrdersByCustomer(Customer customer);
+    List<OrdersDto> findCurrentOrdersByCustomer(Long customerId);
 
     List<OrdersDto> getNewOrdersByManager(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 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java	(revision f7ad420eba0ae27b05bbff3f892e5fd48a4f4504)
@@ -112,7 +112,6 @@
 
     @Override
-    public List<DeliveryDto> getCurrentDeliveriesByCustomer(Customer customer) {
-        List<Delivery> deliveries = this.deliveryRepository.getCurrentDeliveriesByCustomer(customer.getUserId());
-        return buildDto(deliveries);
+    public List<DeliveryDto> getCurrentDeliveriesByCustomer(Long customerId) {
+        return this.deliveryRepository.getCurrentDeliveriesByCustomer(customerId);
     }
 
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 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/OrdersServiceImpl.java	(revision f7ad420eba0ae27b05bbff3f892e5fd48a4f4504)
@@ -118,7 +118,6 @@
 
     @Override
-    public List<OrdersDto> findCurrentOrdersByCustomer(Customer customer) {
-        List<Orders> orders = this.ordersRepository.getCurrentOrdersByCustomer(customer.getUserId());
-        return buildDto(orders);
+    public List<OrdersDto> findCurrentOrdersByCustomer(Long customerId) {
+        return this.ordersRepository.getCurrentOrdersByCustomer(customerId);
     }
 
Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java
===================================================================
--- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java	(revision 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
+++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/CustomerController.java	(revision f7ad420eba0ae27b05bbff3f892e5fd48a4f4504)
@@ -2,4 +2,6 @@
 
 import lombok.RequiredArgsConstructor;
+import mk.ukim.finki.db.distributorapp.model.dto.CustomerDto;
+import mk.ukim.finki.db.distributorapp.model.dto.UserDto;
 import mk.ukim.finki.db.distributorapp.model.entities.Customer;
 import mk.ukim.finki.db.distributorapp.model.entities.Users;
@@ -28,9 +30,9 @@
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         String userEmail = authentication.getName();
-        Users user = this.usersService.findUserByEmail(userEmail);
-        Customer customer = this.customerService.getCustomerObjById(user.getUserId());
+        UserDto user = this.usersService.findUserDtoByEmail(userEmail);
+        CustomerDto customer = this.customerService.findCustomerById(user.getId());
         model.addAttribute("customer", customer);
-        model.addAttribute("currentOrders", ordersService.findCurrentOrdersByCustomer(customer));
-        model.addAttribute("currentDeliveries", deliveryService.getCurrentDeliveriesByCustomer(customer));
+        model.addAttribute("currentOrders", ordersService.findCurrentOrdersByCustomer(customer.getId()));
+        model.addAttribute("currentDeliveries", deliveryService.getCurrentDeliveriesByCustomer(customer.getId()));
         return "home/customer";
     }
Index: backend/src/main/resources/templates/home/customer.html
===================================================================
--- backend/src/main/resources/templates/home/customer.html	(revision 95875dd8e105bf7a4e9842e34bf20b96ba611f8b)
+++ backend/src/main/resources/templates/home/customer.html	(revision f7ad420eba0ae27b05bbff3f892e5fd48a4f4504)
@@ -10,6 +10,46 @@
 
 <div class="container mt-4">
-    <h1>Welcome to the Home Page</h1>
-    <p th:text="'Hello, ' + ${customer.getUsername()} + '!'"></p>
+    <h1 th:text="'Here is your dashboard '+${customer.getCompName()}" class="mb-4"></h1>
+    <div class="row">
+        <div class="col-md-6">
+            <h2>Your Current Orders</h2>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>Order Date</th>
+                    <th>Order Sum</th>
+                    <th>Order Status</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr th:each="order : ${currentOrders}">
+                    <td th:text="${order.getOrdDate()}"></td>
+                    <td th:text="${order.getOrdSum()}"></td>
+                    <td th:text="${order.getStatusName()}"></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+
+        <div class="col-md-6">
+            <h2>Your Current Deliveries</h2>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <th>Delivery Date</th>
+                    <th>Driver Name</th>
+                    <th>Delivery Status</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr th:each="delivery : ${currentDeliveries}">
+                    <td th:text="${delivery.getDelDate()}"></td>
+                    <td th:text="${delivery.getDriverName()}"></td>
+                    <td th:text="${delivery.getDelStatus()}"></td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
 </div>