Index: src/main/java/edu/gjoko/schedlr/controllers/RegisterController.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/controllers/RegisterController.java	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/java/edu/gjoko/schedlr/controllers/RegisterController.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -3,6 +3,4 @@
 import edu.gjoko.schedlr.entity.Stakeholder;
 import edu.gjoko.schedlr.services.StakeholderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
Index: src/main/java/edu/gjoko/schedlr/controllers/rest/AdminApi.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/controllers/rest/AdminApi.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/java/edu/gjoko/schedlr/controllers/rest/AdminApi.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -0,0 +1,26 @@
+package edu.gjoko.schedlr.controllers.rest;
+
+import edu.gjoko.schedlr.entity.Business;
+import edu.gjoko.schedlr.services.BusinessService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@RestController
+@RequestMapping("api/admin")
+@AllArgsConstructor
+public class AdminApi {
+
+    private final BusinessService businessService;
+
+    @PatchMapping
+    public void updateBusinessStatus(@RequestBody List<Business> businessList, HttpServletRequest request) {
+        Long customerId = (long) request.getSession(true).getAttribute("stakeholderId");
+        businessService.updateBusinessStatuses(businessList);
+    }
+}
Index: src/main/java/edu/gjoko/schedlr/controllers/rest/BusinessApi.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/controllers/rest/BusinessApi.java	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/java/edu/gjoko/schedlr/controllers/rest/BusinessApi.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -27,6 +27,7 @@
 
     @PatchMapping
-    public void updateBusinesses(@RequestBody List<Business> businessList) {
-        businessService.updateBusinesses(businessList);
+    public void updateBusinesses(@RequestBody List<Business> businessList, HttpServletRequest request) {
+        Long businessOwnerId = (long) request.getSession(true).getAttribute("stakeholderId");
+        businessService.updateBusinesses(businessList, businessOwnerId);
     }
 
Index: src/main/java/edu/gjoko/schedlr/controllers/rest/CustomerApi.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/controllers/rest/CustomerApi.java	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/java/edu/gjoko/schedlr/controllers/rest/CustomerApi.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -24,6 +24,7 @@
 
     @PatchMapping
-    public void updateCustomer(@RequestBody Stakeholder stakeholder) {
-        stakeholderService.saveOrUpdateStakeholder(stakeholder);
+    public void updateCustomer(@RequestBody Stakeholder stakeholder, HttpServletRequest request) {
+        Long customerId = (long) request.getSession(true).getAttribute("stakeholderId");
+        stakeholderService.saveOrUpdateStakeholder(stakeholder, customerId);
     }
 }
Index: src/main/java/edu/gjoko/schedlr/controllers/rest/ServiceApi.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/controllers/rest/ServiceApi.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/java/edu/gjoko/schedlr/controllers/rest/ServiceApi.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -0,0 +1,36 @@
+package edu.gjoko.schedlr.controllers.rest;
+
+import edu.gjoko.schedlr.entity.Service;
+import edu.gjoko.schedlr.services.ServicesService;
+import lombok.AllArgsConstructor;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Objects;
+
+@RestController
+@RequestMapping("api/service")
+@AllArgsConstructor
+public class ServiceApi {
+
+
+    private ServicesService service;
+    @PostMapping(path="/delete")
+    public void saveBusiness(@RequestBody List<Service> serviceList) {
+        if(!CollectionUtils.isEmpty(serviceList)) {
+            List<Long> serviceIds = serviceList.stream()
+                    .map(Service::getId)
+                    .filter(Objects::nonNull)
+                    .toList();
+            service.deleteByIds(serviceIds);
+        }
+    }
+
+    @PatchMapping
+    public void updateServices (@RequestBody List<Service> serviceList, HttpServletRequest request) {
+        Long ownerId = (long) request.getSession(true).getAttribute("stakeholderId");
+        service.saveOrUpdateServices(serviceList, ownerId);
+    }
+}
Index: src/main/java/edu/gjoko/schedlr/entity/Service.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/Service.java	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/java/edu/gjoko/schedlr/entity/Service.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -54,4 +54,8 @@
     private List<Appointment> appointments;
 
+    @Column(name = "service_status")
+    @Enumerated(EnumType.STRING)
+    private ServiceStatus serviceStatus;
+
     @Column(name = "created")
     @CreatedDate
Index: src/main/java/edu/gjoko/schedlr/entity/ServiceStatus.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/entity/ServiceStatus.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/java/edu/gjoko/schedlr/entity/ServiceStatus.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -0,0 +1,8 @@
+package edu.gjoko.schedlr.entity;
+
+public enum ServiceStatus {
+
+    ACTIVE,
+
+    INACTIVE
+}
Index: src/main/java/edu/gjoko/schedlr/repositories/BusinessRepository.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/repositories/BusinessRepository.java	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/java/edu/gjoko/schedlr/repositories/BusinessRepository.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -16,6 +16,5 @@
     Business findBusinessByOwner(Stakeholder owner);
 
-    List<Business> findBusinessesByBusinessTypeAndBusinessStatus(BusinessType businessType, BusinessStatus businessStatus);
-
+    Business findBusinessesByOwner_Id(Long ownerId);
     List<Business> findBusinessesByBusinessStatusAndBusinessType_Id(BusinessStatus businessStatus, Long id);
 }
Index: src/main/java/edu/gjoko/schedlr/repositories/ServiceRepository.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/repositories/ServiceRepository.java	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/java/edu/gjoko/schedlr/repositories/ServiceRepository.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -1,8 +1,11 @@
 package edu.gjoko.schedlr.repositories;
 
-import edu.gjoko.schedlr.entity.Business;
 import edu.gjoko.schedlr.entity.Service;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 @Repository
Index: src/main/java/edu/gjoko/schedlr/repositories/ServiceTypeRepository.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/repositories/ServiceTypeRepository.java	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/java/edu/gjoko/schedlr/repositories/ServiceTypeRepository.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -4,4 +4,6 @@
 import edu.gjoko.schedlr.entity.ServiceType;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
Index: src/main/java/edu/gjoko/schedlr/services/BusinessService.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/services/BusinessService.java	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/java/edu/gjoko/schedlr/services/BusinessService.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -1,10 +1,11 @@
 package edu.gjoko.schedlr.services;
 
-import edu.gjoko.schedlr.entity.*;
-import edu.gjoko.schedlr.repositories.*;
+import edu.gjoko.schedlr.entity.Business;
+import edu.gjoko.schedlr.entity.Stakeholder;
+import edu.gjoko.schedlr.entity.StakeholderType;
+import edu.gjoko.schedlr.repositories.BusinessRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.util.List;
@@ -18,13 +19,10 @@
 
     private final BusinessRepository businessRepository;
-    private final ServiceTypeRepository serviceTypeRepository;
-    private final ServiceRepository serviceRepository;
+    private final ServicesService servicesService;
     private final StakeholderService stakeholderService;
-
-    private final StakeholderRepository stakeholderRepository;
     private BCryptPasswordEncoder bCryptPasswordEncoder;
 
     public void saveBusiness(Business business) {
-        saveNewServiceTypes(business);
+        servicesService.saveNewServiceTypes(business);
         business.getOwner().setStakeholderType(StakeholderType.BUSINESS_OWNER);
         business.getOwner().setPassword(bCryptPasswordEncoder.encode(business.getOwner().getPassword()));
@@ -33,27 +31,23 @@
     }
 
-    public void saveNewServiceTypes(Business business) {
-        business.getServices()
-                .stream()
-                .forEach(service -> {
-                    if (service.getServiceType().getId() == null) {
-                        ServiceType serviceType = service.getServiceType();
-                        serviceType.setBusinessType(business.getBusinessType());
-                        service.setServiceType(serviceTypeRepository.save(serviceType));
-                    }
-                });
-    }
-
     public List<Business> findAll() {
         return businessRepository.findAll();
     }
 
-    public void updateBusinesses(List<Business> businessList) {
+    public void updateBusinesses(List<Business> businessList, Long businessOwnerId) {
         businessList
                 .stream()
                 .forEach(business -> {
-                    stakeholderService.saveOrUpdateStakeholder(business.getOwner());
-                    saveOrUpdateServices(business.getServices());
-                    saveOrUpdateBusiness(business);
+                    stakeholderService.saveOrUpdateStakeholder(business.getOwner(), businessOwnerId);
+                });
+    }
+
+    public void updateBusinessStatuses(List<Business> businessList) {
+        businessList
+                .stream()
+                .forEach(business -> {
+                    Business business1 = businessRepository.findById(business.getId()).get();
+                    business1.setBusinessStatus(business.getBusinessStatus());
+                    businessRepository.save(business1);
                 });
     }
@@ -68,25 +62,3 @@
         return businessRepository.findBusinessesByBusinessStatusAndBusinessType_Id(ACTIVE, businessTypeId);
     }
-
-
-
-    private void saveOrUpdateBusiness(Business business) {
-        if (business.getId() != null) {
-            var foundBusinessEntity = businessRepository.findById(business.getId());
-            business.setCreated(foundBusinessEntity.get().getCreated());
-        }
-        businessRepository.save(business);
-    }
-
-    private void saveOrUpdateServices(List<edu.gjoko.schedlr.entity.Service> serviceList) {
-        if (!CollectionUtils.isEmpty(serviceList)) {
-            serviceList.forEach( service -> {
-                if (service.getId() != null) {
-                    var found = serviceRepository.findById(service.getId());
-                    service.setCreated(found.get().getCreated());
-                }
-            });
-            serviceRepository.saveAll(serviceList);
-        }
-    }
 }
Index: src/main/java/edu/gjoko/schedlr/services/ServicesService.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/services/ServicesService.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
+++ src/main/java/edu/gjoko/schedlr/services/ServicesService.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -0,0 +1,72 @@
+package edu.gjoko.schedlr.services;
+
+import edu.gjoko.schedlr.entity.Business;
+import edu.gjoko.schedlr.entity.ServiceStatus;
+import edu.gjoko.schedlr.entity.ServiceType;
+import edu.gjoko.schedlr.repositories.BusinessRepository;
+import edu.gjoko.schedlr.repositories.BusinessTypeRepository;
+import edu.gjoko.schedlr.repositories.ServiceRepository;
+import edu.gjoko.schedlr.repositories.ServiceTypeRepository;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.transaction.Transactional;
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@AllArgsConstructor
+public class ServicesService {
+
+    private final ServiceRepository serviceRepository;
+    private final ServiceTypeRepository serviceTypeRepository;
+    private final BusinessRepository businessRepository;
+
+    @Transactional
+    public void deleteByIds(List<Long> ids) {
+        ids.forEach(this::deactivateService);
+    }
+
+    public void saveOrUpdateServices(List<edu.gjoko.schedlr.entity.Service> serviceList, Long ownerId) {
+        if (!CollectionUtils.isEmpty(serviceList)) {
+            serviceList.forEach( service -> {
+                Optional<edu.gjoko.schedlr.entity.Service> foundOptional;
+                if (service.getId() != null && (foundOptional = serviceRepository.findById(service.getId())).isPresent()) {
+                    var found = foundOptional.get();
+                    found.setDuration(service.getDuration());
+                    found.setPrice(service.getPrice());
+                    found.setServiceStatus(ServiceStatus.ACTIVE);
+                    serviceRepository.save(found);
+                } else {
+                    var business = businessRepository.findBusinessesByOwner_Id(ownerId);
+                    service.getServiceType().setBusinessType(business.getBusinessType());
+                    service.setServiceStatus(ServiceStatus.ACTIVE);
+                    service.setBusiness(business);
+                    serviceTypeRepository.save(service.getServiceType());
+                    serviceRepository.save(service);
+                }
+            });
+        }
+    }
+
+    public void saveNewServiceTypes(Business business) {
+        business.getServices()
+                .forEach(service -> {
+                    if (service.getServiceType().getId() == null) {
+                        ServiceType serviceType = service.getServiceType();
+                        serviceType.setBusinessType(business.getBusinessType());
+                        service.setServiceType(serviceTypeRepository.save(serviceType));
+                    }
+                });
+    }
+
+    private void deactivateService(Long id) {
+        Optional<edu.gjoko.schedlr.entity.Service> serviceOptional;
+        if((serviceOptional = serviceRepository.findById(id)).isPresent()) {
+            var service = serviceOptional.get();
+            service.setServiceStatus(ServiceStatus.INACTIVE);
+            serviceRepository.save(service);
+        }
+    }
+}
Index: src/main/java/edu/gjoko/schedlr/services/StakeholderService.java
===================================================================
--- src/main/java/edu/gjoko/schedlr/services/StakeholderService.java	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/java/edu/gjoko/schedlr/services/StakeholderService.java	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -4,25 +4,19 @@
 import edu.gjoko.schedlr.entity.StakeholderType;
 import edu.gjoko.schedlr.repositories.StakeholderRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import java.util.Optional;
-
 @Service
+@RequiredArgsConstructor
 public class StakeholderService {
 
-    private StakeholderRepository stakeholderRepository;
-    private BCryptPasswordEncoder bCryptPasswordEncoder;
+    private final StakeholderRepository stakeholderRepository;
+    private final BCryptPasswordEncoder bCryptPasswordEncoder;
 
-    public StakeholderService(StakeholderRepository stakeholderRepository,
-                              BCryptPasswordEncoder bCryptPasswordEncoder) {
-        this.stakeholderRepository = stakeholderRepository;
-        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
-    }
-
-    public Stakeholder saveStakeholder(Stakeholder stakeholder) {
+    public void saveStakeholder(Stakeholder stakeholder) {
         stakeholder.setPassword(bCryptPasswordEncoder.encode(stakeholder.getPassword()));
         stakeholder.setStakeholderType(StakeholderType.CUSTOMER);
-        return stakeholderRepository.save(stakeholder);
+        stakeholderRepository.save(stakeholder);
     }
 
@@ -31,14 +25,12 @@
     }
 
-    public void saveOrUpdateStakeholder(Stakeholder stakeholder) {
-        if (stakeholder.getId() != null) {
-            var found = stakeholderRepository.findById(stakeholder.getId()).get();
-            found.setFirstName(stakeholder.getFirstName());
-            found.setLastName(stakeholder.getLastName());
-            found.setPhoneNumber(stakeholder.getPhoneNumber());
-            found.setEmail(stakeholder.getEmail());
-            found.setUsername(stakeholder.getUsername());
-            stakeholderRepository.save(found);
-        }
+    public void saveOrUpdateStakeholder(Stakeholder stakeholder, Long businessOwnerId) {
+        var found = stakeholderRepository.findById(businessOwnerId).get();
+        found.setFirstName(stakeholder.getFirstName());
+        found.setLastName(stakeholder.getLastName());
+        found.setPhoneNumber(stakeholder.getPhoneNumber());
+        found.setEmail(stakeholder.getEmail());
+        found.setUsername(stakeholder.getUsername());
+        stakeholderRepository.save(found);
     }
 }
Index: src/main/resources/data.sql
===================================================================
--- src/main/resources/data.sql	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/resources/data.sql	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -19,13 +19,13 @@
 values (nextval('hibernate_sequence'), current_timestamp, '075658123', 'admin@schedlr.com', 'admin', 'admin', current_timestamp, '$2a$10$DJyjt.Vj/U8MEuYX1PXL9ukQSMwXHVdhre3POlTqpYzNxHB5gu/MW','ADMIN', 'admin'),
         (nextval('hibernate_sequence'), current_timestamp, '071658125', 'user1@schedlr.com', 'gjoko', 'kostadinov', current_timestamp, '$2a$10$Zc28AcCpAgxB.e67UMF/2.FgchjH9QWB7z8nP0TdkrFneV4IHPXji','CUSTOMER', 'user'),
-        (11111, current_timestamp, '078658523',  'c@c.com', 'Kliment', 'Nedelkovski', current_timestamp, '$2a$10$OratLSMKNsqd7Re.Md3I4.jrRHtTQNaLz/wUKo.I98..GufnD48uG','CUSTOMER', 'kliment123'),
-        (10000, current_timestamp, '071218123', 'q@c.com', 'Stefan', 'Petrovski', current_timestamp, '$2a$10$x10O8eLp1r1wHwxDGvyo5.TBL216p8h797JJjQYEfFTbj/1bnCMki','BUSINESS_OWNER', 'stefan123');
+        (11111, current_timestamp, '078658523',  'c@c.com', 'Kliment', 'Nedelkovski', current_timestamp, '$2a$10$OratLSMKNsqd7Re.Md3I4.jrRHtTQNaLz/wUKo.I98..GufnD48uG','CUSTOMER', 'c'),
+        (10000, current_timestamp, '071218123', 'q@c.com', 'Stefan', 'Petrovski', current_timestamp, '$2a$10$x10O8eLp1r1wHwxDGvyo5.TBL216p8h797JJjQYEfFTbj/1bnCMki','BUSINESS_OWNER', 'q');
 
 insert into business (id, business_status, company_name, created, modified, business_type_id, owner_id)
 values (10001, 'ACTIVE', 'krojach stefan', current_timestamp, current_timestamp, 1, 10000);
 
-insert into service (id, created, modified, duration, price, cumulated_rating, reviews_count, business_id, service_type_id)
-values (10002, current_timestamp, current_timestamp, 60, 400, 0, 0, 10001, 6),
-       (10003, current_timestamp, current_timestamp, 30, 200, 0, 0, 10001, 7);
+insert into service (id, created, modified, service_status, duration, price, cumulated_rating, reviews_count, business_id, service_type_id)
+values (10002, current_timestamp, current_timestamp, 'ACTIVE', 60, 400, 0, 0, 10001, 6),
+       (10003, current_timestamp, current_timestamp, 'ACTIVE', 30, 200, 0, 0, 10001, 7);
 
 insert into appointment (id, created, modified, start_time, end_time, stakeholder_id, service_id)
Index: src/main/resources/static/css/customer_admin.css
===================================================================
--- src/main/resources/static/css/customer_admin.css	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/resources/static/css/customer_admin.css	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -1,7 +1,5 @@
 .rate{
-
     border-bottom-right-radius: 12px;
     border-bottom-left-radius: 12px;
-
 }
 
Index: src/main/resources/static/js/admin.js
===================================================================
--- src/main/resources/static/js/admin.js	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/resources/static/js/admin.js	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -20,9 +20,8 @@
             }
         });
-        console.log(JSON.stringify(companiesToSave));
 
 
         $.ajax({
-            url: "http://localhost:8080/api/business",
+            url: "http://localhost:8080/api/admin",
             type:"PATCH",
             data: JSON.stringify(companiesToSave),
Index: src/main/resources/static/js/business_admin.js
===================================================================
--- src/main/resources/static/js/business_admin.js	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/resources/static/js/business_admin.js	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -2,5 +2,7 @@
     var business = {};
 
-    getBusinessInfo(business);
+    getBusinessInfo().then(function (data) {
+        business = data;
+    });
 
     getAppointments();
@@ -33,5 +35,4 @@
     $("#update_services_button").click(function () {
         businesses = [];
-        console.log("Gjoko");
         servicesObj = [];
         $.each($('#predefined_services_admin_panel input:checked').siblings(), function (index, label) {
@@ -43,5 +44,5 @@
             var price = $($($(label).parent()).siblings()[1]).children()[0].value;
 
-            var serviceType = {}
+            var serviceType = {};
             if (parseInt(id) != -1) {
                 service['id'] = parseInt(id);
@@ -56,22 +57,31 @@
             servicesObj.push(service);
         });
-        business['services'] = servicesObj;
-
-        businesses.push(business);
-        console.log(JSON.stringify(businesses));
-
-        $.ajax({
-            url: "http://localhost:8080/api/business",
-            type:"PATCH",
-            data: JSON.stringify(businesses),
-            contentType:"application/json; charset=utf-8",
-            dataType: 'text',
-            success: function(succ){
-                alert( "Updates applied successfully" );
-            },
-            error: function(err) {
-                alert(err);
-            }
-        });
+
+        var servicesForDelete=[];
+        $.each($('#predefined_services_admin_panel input:not(:checked)').siblings(), function (index, label) {
+            let id = $(label).prop('for');
+            let foundService = business['services'].find(obj => obj.id === parseInt(id));
+            if (foundService !== undefined && foundService['serviceStatus'] === 'ACTIVE') {
+                let service1 = {};
+                service1['id'] = id;
+                servicesForDelete.push(service1);
+            }
+        });
+
+
+        updateServices(servicesObj).then(function (response) {
+            getBusinessInfo().then(function (data) {
+                business = data;
+            });
+        });
+
+        if (servicesForDelete.length > 0) {
+            deleteServices(servicesForDelete).then(function (response) {
+                getBusinessInfo().then(function (data) {
+                    business = data;
+                });
+            });
+        }
+
         event.preventDefault();
     });
@@ -79,29 +89,71 @@
     $("#update_owner_button").click(function() {
         businesses = [];
-        business['owner']['firstName'] = $('#firstName').val();
-        business['owner']['lastName'] = $('#lastName').val();
-        business['owner']['email'] = $('#email').val();
-        business['owner']['phoneNumber'] = $('#phoneNumber').val();
-        business['owner']['username'] = $('#username').val();
+        owner={};
+        owner['firstName'] = $('#firstName').val();
+        owner['lastName'] = $('#lastName').val();
+        owner['email'] = $('#email').val();
+        owner['phoneNumber'] = $('#phoneNumber').val();
+        owner['username'] = $('#username').val();
+
+        business['owner'] = owner;
 
         businesses.push(business);
-        console.log(JSON.stringify(businesses));
-
-        $.ajax({
-            url: "http://localhost:8080/api/business",
-            type:"PATCH",
-            data: JSON.stringify(businesses),
-            contentType:"application/json; charset=utf-8",
-            dataType: 'text',
-            success: function(succ){
-                alert( "Updates applied successfully" );
-            },
-            error: function(err) {
-                alert(err);
-            }
+
+        updateBusinessInfo(businesses).then(function() {
+            getBusinessInfo().then(function (found) {
+                business = found;
+            });
         });
     });
     event.preventDefault();
 });
+
+function updateBusinessInfo(businessList) {
+    return $.ajax({
+        url: "http://localhost:8080/api/business",
+        type:"PATCH",
+        data: JSON.stringify(businessList),
+        contentType:"application/json; charset=utf-8",
+        dataType: 'text',
+        success: function(succ){
+            alert( "Updates applied successfully" );
+        },
+        error: function(err) {
+            alert(err);
+        }
+    });
+}
+
+function updateServices(serviceList) {
+    return $.ajax({
+        url: "http://localhost:8080/api/service",
+        type:"PATCH",
+        data: JSON.stringify(serviceList),
+        contentType:"application/json; charset=utf-8",
+        dataType: 'text',
+        success: function(succ){
+            alert( "Updates applied successfully" );
+        },
+        error: function(err) {
+            alert(err);
+        }
+    });
+}
+
+function deleteServices(services) {
+    return $.ajax({
+        url: "http://localhost:8080/api/service/delete",
+        type:"POST",
+        data: JSON.stringify(services),
+        contentType:"application/json; charset=utf-8",
+        dataType: 'text',
+        success: function(succ){
+            console.log("services deleted successfully");
+        },
+        error: function(err) {
+            console.error(err);
+        }
+    });
+}
 
 function cancelAppointment(appointmentId) {
@@ -123,5 +175,4 @@
         url: "http://localhost:8080/api/appointment/future/me"
     }).then(function (data) {
-        console.log(data);
         var $el = $("#bookings-table-body");
         $el.empty();
@@ -154,13 +205,12 @@
 }
 
-function getBusinessInfo(business) {
-    $.ajax({
+function getBusinessInfo() {
+    return $.ajax({
         url: "http://localhost:8080/api/business/me"
-    }).then(function (data) {
-        business = data;
+    }).then(function (business) {
         var $header = $("#header");
 
         // header
-        $header.text($header.text() + " " + business["owner"]['firstName'] + " " + business['owner']['lastName']);
+        $header.text("Welcome back " + business["owner"]['firstName'] + " " + business['owner']['lastName']);
 
         // business info
@@ -181,10 +231,17 @@
         var $el = $("#predefined_services_admin_panel");
         $el.empty();
+
         $.each(business['services'], function (index, obj) {
-            $el.append(
-                '<div class=\"form-outline mb-4\">' +
+
+            var element = '<div class=\"form-outline mb-4\">' +
                 '    <div class="row">' +
                 '        <div class="col-md-6">\n' +
-                '            <input class="form-check-input" type="checkbox" checked value=\"' + obj.id + '\" id=\"' + obj.id + '\">\n' +
+                '            <input class="form-check-input" type="checkbox" ';
+
+            if (obj['serviceStatus'] === 'ACTIVE') {
+                element += 'checked';
+            }
+
+            element += ' value=\"' + obj.id + '\" id=\"' + obj.id + '\">\n' +
                 '            <label class="form-check-label" for=\"' + obj.id + '\">\n' + obj['serviceType'].name + '</label>\n' +
                 '        </div>' +
@@ -196,6 +253,9 @@
                 '        </div>' +
                 '    </div>' +
-                '</div>');
-        });
-    });
-}
+                '</div>';
+
+            $el.append(element);
+        });
+        return business;
+    });
+}
Index: src/main/resources/static/js/customer_admin.js
===================================================================
--- src/main/resources/static/js/customer_admin.js	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/resources/static/js/customer_admin.js	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -16,6 +16,4 @@
         customerForSave['phoneNumber'] = $('#phoneNumber').val();
         customerForSave['username'] = $('#username').val();
-
-        console.log(JSON.stringify(customerForSave));
 
         $.ajax({
@@ -55,8 +53,4 @@
         const recipientId = button.getAttribute('data-bs-id');
 
-        console.log(recipientName + ' ' + recipientId);
-        // If necessary, you could initiate an Ajax request here
-        // and then do the updating in a callback.
-
         // Update the modal's content.
         const modalTitle = reviewModal.querySelector('.modal-title');
@@ -97,5 +91,4 @@
         url: "http://localhost:8080/api/appointment/future/me"
     }).then(function (data) {
-        console.log(data);
         var $el = $("#appointments-table-body");
         $el.empty();
@@ -194,5 +187,4 @@
         url: "http://localhost:8080/api/review/me"
     }).then(function (data) {
-        console.log(data);
         var $el = $("#my-reviews");
         $el.empty();
@@ -233,4 +225,5 @@
             $('#reviewModal').modal('toggle');
             getPastAppointments();
+            getReviewsForCustomer();
         },
         error: function(error) {
@@ -248,5 +241,5 @@
         }).success(function (data) {
             alert("Appointment successfully canceled.")
-            getAppointments();
+            getFutureAppointments();
         }).error(function (error) {
             alert("Something went wrong.");
Index: src/main/resources/static/js/homepage.js
===================================================================
--- src/main/resources/static/js/homepage.js	(revision 77205be723c8b2ffd1ee5618a05e1d12b1cee44a)
+++ src/main/resources/static/js/homepage.js	(revision 1413ee288bce0d328676a027fdef65e0f7ad576d)
@@ -102,4 +102,5 @@
             // get already stored service from in-memory
             selectedServices = businesses.find(item => item.id == selectedVal)['services'];
+            console.log(selectedServices);
             resetAndAppendServices(selectedServices);
         });
@@ -164,5 +165,7 @@
 
     $.each(services, function (index, obj) {
-        $el.append("<option value=" + obj.id + ">" + obj.serviceType.name + "</option>");
+        if (obj.serviceStatus === 'ACTIVE') {
+            $el.append("<option value=" + obj.id + ">" + obj.serviceType.name + "</option>");
+        }
     });
 }