diff --git a/components/FacilityDetailsTabs.js b/components/FacilityDetailsTabs.js
index 211a68e8..303a8843 100644
--- a/components/FacilityDetailsTabs.js
+++ b/components/FacilityDetailsTabs.js
@@ -53,15 +53,15 @@ function FacilityDetailsTabs({ facility }) {
         >
           <div className="col-span-4 md:col-span-4 flex flex-col gap-y-2 group items-center justify-start text-left">
             {/* Status */}
-            <div className="bg-blue-50 w-full grid grid-cols-2 gap-3 mt-4">
+            <div className="bg-blue-50 w-full flex flex-col gap-3 mt-4">
               <h3 className="text-lg leading-tight underline col-span-2 text-gray-700 font-medium">
                 Status:
               </h3>
-              <div className="grid grid-cols-2 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
+              <div className="grid grid-cols-3 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
                 <label className=" text-gray-600">
                   Facility closed
                 </label>
-                <p className="text-black font-medium text-base flex">
+                <p className="text-black font-medium col-start-3 text-base flex">
                   {facility?.closed ? (
                     <span className="leading-none whitespace-nowrap text-sm  py-1 px-2 bg-red-200 text-red-900 flex gap-x-1 items-center cursor-default">
                       Closed on {new Date(facility?.closed_date).toLocaleDateString() || ""}
@@ -74,21 +74,21 @@ function FacilityDetailsTabs({ facility }) {
                 </p>
               </div>
               {facility?.closed && (
-                <div className="grid grid-cols-2 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
+                <div className="grid grid-cols-3 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
                   <label className=" text-gray-600">
                     Facility closure reason
                   </label>
-                  <p className="text-black font-medium text-base">
+                  <p className="text-black font-medium col-start-3 text-base">
                     
                     {facility?.closing_reason || ""}
                   </p>
                 </div>
               )}
-              <div className="grid grid-cols-2 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
+              <div className="grid grid-cols-3 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
                 <label className=" text-gray-600">
                   KHIS reporting
                 </label>
-                <p className="text-black font-medium text-base flex">
+                <p className="text-black font-medium col-start-3 text-base flex">
                   {facility?.reporting_in_dhis ? (
                     <span className="leading-none whitespace-nowrap text-sm  py-1 px-2 bg-blue-200 text-blue-900 flex gap-x-1 items-center cursor-default">
                       <CheckCircleIcon className="h-4 w-4" />
@@ -102,11 +102,11 @@ function FacilityDetailsTabs({ facility }) {
                   )}
                 </p>
               </div>
-              <div className="grid grid-cols-2 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
+              <div className="grid grid-cols-3 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
                 <label className=" text-gray-600">
                   NHIF accreditation
                 </label>
-                <p className="text-black font-medium text-base flex">
+                <p className="text-black font-medium col-start-3 text-base flex">
                   {facility?.nhif_accreditation ? (
                     <span className="leading-none whitespace-nowrap text-sm  py-1 px-2 bg-blue-200 text-blue-900 flex gap-x-1 items-center cursor-default">
                       <CheckCircleIcon className="h-4 w-4" />
@@ -120,11 +120,11 @@ function FacilityDetailsTabs({ facility }) {
                   )}
                 </p>
               </div>
-              <div className="grid grid-cols-2 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
+              <div className="grid grid-cols-3 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
                 <label className=" text-gray-600">
                   Open 24 hours
                 </label>
-                <p className="text-black font-medium text-base flex">
+                <p className="text-black font-medium col-start-3 text-base flex">
                   {facility?.open_normal_day ? (
                     <span className="leading-none whitespace-nowrap text-sm  py-1 px-2 bg-blue-200 text-blue-900 flex gap-x-1 items-center cursor-default">
                       <CheckCircleIcon className="h-4 w-4" />
@@ -138,11 +138,11 @@ function FacilityDetailsTabs({ facility }) {
                   )}
                 </p>
               </div>
-              <div className="grid grid-cols-2 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
+              <div className="grid grid-cols-3 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
                 <label className=" text-gray-600">
                   Open weekends
                 </label>
-                <p className="text-black font-medium text-base flex">
+                <p className="text-black font-medium col-start-3 text-base flex">
                   {facility?.open_weekends ? (
                     <span className="leading-none whitespace-nowrap text-sm  py-1 px-2 bg-blue-200 text-blue-900 flex gap-x-1 items-center cursor-default">
                       <CheckCircleIcon className="h-4 w-4" />
@@ -156,11 +156,11 @@ function FacilityDetailsTabs({ facility }) {
                   )}
                 </p>
               </div>
-              <div className="grid grid-cols-2 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
+              <div className="grid grid-cols-3 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
                 <label className=" text-gray-600">
                   Open late night
                 </label>
-                <p className="text-black font-medium text-base flex">
+                <p className="text-black font-medium col-start-3 text-base flex">
                   {facility?.open_late_night ? (
                     <span className="leading-none whitespace-nowrap text-sm  py-1 px-2 bg-blue-200 text-blue-900 flex gap-x-1 items-center cursor-default">
                       <CheckCircleIcon className="h-4 w-4" />
@@ -174,11 +174,11 @@ function FacilityDetailsTabs({ facility }) {
                   )}
                 </p>
               </div>
-              <div className="grid grid-cols-2 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
+              <div className="grid grid-cols-3 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
                 <label className=" text-gray-600">
                   Facility classified
                 </label>
-                <p className="text-black font-medium text-base flex">
+                <p className="text-black font-medium col-start-3 text-base flex">
                   {facility?.is_classified ? (
                     <span className="leading-none whitespace-nowrap text-sm  py-1 px-2 bg-blue-200 text-blue-900 flex gap-x-1 items-center cursor-default">
                       <CheckCircleIcon className="h-4 w-4" />
@@ -192,9 +192,9 @@ function FacilityDetailsTabs({ facility }) {
                   )}
                 </p>
               </div>
-              <div className="grid grid-cols-2 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
+              <div className="grid grid-cols-3 w-full md:w-11/12 md:px-3 col-span-2 md:col-span-1 mx-auto leading-none items-center">
                 <label className=" text-gray-600">Published</label>
-                <p className="text-black font-medium text-base flex">
+                <p className="text-black font-medium col-start-3 text-base flex">
                   {facility?.is_published ? (
                     <span className="leading-none whitespace-nowrap text-sm  py-1 px-2 bg-blue-200 text-blue-900 flex gap-x-1 items-center cursor-default">
                       <CheckCircleIcon className="h-4 w-4" />
@@ -219,7 +219,7 @@ function FacilityDetailsTabs({ facility }) {
                   <label className="col-span-1 text-gray-600">
                     Date established
                   </label>
-                  <p className="col-span-2 text-black font-medium text-base">
+                  <p className=" text-black col-start-3 font-medium text-base">
                     {new Date(
                       facility?.date_established
                     ).toLocaleDateString("en-GB", {
@@ -235,7 +235,7 @@ function FacilityDetailsTabs({ facility }) {
                   <label className="col-span-1 text-gray-600">
                     Date requested
                   </label>
-                  <p className="col-span-2 text-black font-medium text-base">
+                  <p className="text-black col-start-3 font-medium text-base">
                     {new Date(
                       facility?.date_requested
                     ).toLocaleDateString("en-GB", {
@@ -251,7 +251,7 @@ function FacilityDetailsTabs({ facility }) {
                   <label className="col-span-1 text-gray-600">
                     Date approved
                   </label>
-                  <p className="col-span-2 text-black font-medium text-base">
+                  <p className="text-black col-start-3 font-medium text-base">
                     {new Date(
                       facility?.date_approved
                     ).toLocaleDateString("en-GB", {
@@ -266,7 +266,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Regulated
                 </label>
-                <p className="col-span-2 text-black font-medium text-base flex">
+                <p className="text-black font-medium col-start-3 text-base flex">
                   {facility?.regulated ? (
                     <span className="leading-none whitespace-nowrap text-sm  py-1 px-2 bg-blue-200 text-blue-900 flex gap-x-1 items-center cursor-default">
                       <CheckCircleIcon className="h-4 w-4" />
@@ -284,7 +284,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Regulation status
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.regulatory_status_name || " - "}
                 </p>
               </div>
@@ -292,7 +292,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Regulating body
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.facility_units < 1
                     ? " - "
                     : facility?.facility_units !== undefined ? (facility?.facility_units[0].regulating_body_name || " - ") : ' - '}
@@ -303,7 +303,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Registration number
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.facility_units < 1
                     ? " - "
                     : facility?.facility_units !== undefined ? (facility?.facility_units[0].registration_number || " - ") : ' - '}
@@ -314,7 +314,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   License number
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.facility_units < 1
                     ? " - "
                     : facility?.facility_units !== undefined ? (facility?.facility_units[0].license_number || " - ") : ' - '}
@@ -331,7 +331,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Category
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.owner_type_name || " - "}
                 </p>
               </div>
@@ -339,7 +339,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Owner
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.owner_name || " - "}
                 </p>
               </div>
@@ -353,7 +353,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   County
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.county || " - "}
                 </p>
               </div>
@@ -361,7 +361,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Sub County
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.sub_county_name || " - "}
                 </p>
               </div>
@@ -369,7 +369,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Ward
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.ward_name || " - "}
                 </p>
               </div>
@@ -377,7 +377,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Latitude
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.lat_long && facility?.lat_long.length > 0 ? facility?.lat_long[0] :  " - "}
                 </p>
               </div>
@@ -385,7 +385,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Longitude
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                 { facility?.lat_long && facility?.lat_long.length > 0  ? facility?.lat_long[1] :  " - "}
                 </p>
               </div>
@@ -393,7 +393,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Town
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.town_name || " - "}
                 </p>
               </div>
@@ -401,7 +401,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Description
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.location_desc || " - "}
                 </p>
               </div>
@@ -409,7 +409,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Nearest landmark
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.nearest_landmark || " - "}
                 </p>
               </div>
@@ -417,7 +417,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Plot number
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.plot_number || " - "}
                 </p>
               </div>
@@ -431,7 +431,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Total In-patient beds 
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.number_of_beds}
                 </p>
               </div>
@@ -439,7 +439,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                    General In-patient beds
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.number_of_inpatient_beds}
                 </p>
               </div>
@@ -447,7 +447,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Cots
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.number_of_cots}
                 </p>
               </div>
@@ -455,7 +455,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Maternity beds
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.number_of_maternity_beds}
                 </p>
               </div>
@@ -463,7 +463,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Emergency casualty beds
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.number_of_emergency_casualty_beds}
                 </p>
               </div>
@@ -471,7 +471,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Intensive Care Unit beds
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.number_of_icu_beds}
                 </p>
               </div>
@@ -479,7 +479,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   High Dependency Unit beds
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.number_of_hdu_beds}
                 </p>
               </div>
@@ -487,7 +487,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Isolation beds
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.number_of_isolation_beds}
                 </p>
               </div>
@@ -502,7 +502,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   General theatres
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.number_of_general_theatres}
                 </p>
               </div>
@@ -510,7 +510,7 @@ function FacilityDetailsTabs({ facility }) {
                 <label className="col-span-1 text-gray-600">
                   Maternity theatres
                 </label>
-                <p className="col-span-2 text-black font-medium text-base">
+                <p className="col-start-3 text-black font-medium text-base">
                   {facility?.number_of_maternity_theatres}
                 </p>
               </div>
@@ -533,7 +533,7 @@ function FacilityDetailsTabs({ facility }) {
                           .slice(1)
                           .toLocaleLowerCase() || "Contact"}
                     </label>
-                    <p className="col-span-2 text-black font-medium text-base">
+                    <p className="col-start-3 text-black font-medium text-base">
                       {contact.contact || " - "}
                     </p>
                   </div>
@@ -544,7 +544,7 @@ function FacilityDetailsTabs({ facility }) {
                     {facility?.officer_in_charge.title_name ||
                       "Officer in charge"}
                   </label>
-                  <p className="col-span-2 text-black font-medium text-base">
+                  <p className="col-start-3 text-black font-medium text-base">
                     {facility?.officer_in_charge.name || " - "}
                   </p>
                 </div>
@@ -563,7 +563,7 @@ function FacilityDetailsTabs({ facility }) {
                           .slice(1)
                           .toLocaleLowerCase() || "Contact"}
                     </label>
-                    <p className="col-span-2 text-black font-medium text-base">
+                    <p className="col-start-3 text-black font-medium text-base">
                       {contact.contact || " - "}
                     </p>
                   </div>
diff --git a/components/FacilityDetailsTabsPublic.js b/components/FacilityDetailsTabsPublic.js
index 00fb5e87..374f4312 100644
--- a/components/FacilityDetailsTabsPublic.js
+++ b/components/FacilityDetailsTabsPublic.js
@@ -60,7 +60,7 @@ function FacilityDetailsTabsPulic({ facility }) {
             let rating_val = [];
             rating_val[0] = data.rating;
             rating_val[1] = data.comment;
-            alert.success({timeout: 10000}, "Review submitted successfully");
+            alert.success("Review submitted successfully");
             window.localStorage.setItem("rating", JSON.stringify(rating_val));
 
             //clear
@@ -78,7 +78,7 @@ function FacilityDetailsTabsPulic({ facility }) {
         console.log(error);
       }
     } else {
-      alert.error({timeout: 10000}, "Rating value must be greater than zero");
+      alert.error("Rating value must be greater than zero");
     }
   };
     
diff --git a/components/FacilityUpdatesTable.js b/components/FacilityUpdatesTable.js
index b42582bb..b5f02506 100644
--- a/components/FacilityUpdatesTable.js
+++ b/components/FacilityUpdatesTable.js
@@ -7,7 +7,7 @@ function FacilityUpdatesTable({ facilityUpdatedJson, originalData }) {
 
 
     return (
-        <Table className="md:px-4">
+        <Table className="md:px-4 mt-4">
          
             {/* Switch FacilityTableUpdates View */}
             <TableBody className='w-full flex flex-col gap-y-6'>
diff --git a/components/Forms/BasicDetailsForm.js b/components/Forms/BasicDetailsForm.js
index 00e7d2f9..8316285b 100644
--- a/components/Forms/BasicDetailsForm.js
+++ b/components/Forms/BasicDetailsForm.js
@@ -324,7 +324,7 @@ export function BasicDeatilsForm({ editMode }) {
     })
     .then(res => {
       if (res.status == 204 || res.status == 200) {
-        alert.success({timeout: 10000}, 'Facility Updated Successfully')
+        alert.success('Facility Updated Successfully')
         setSubmitting(false)
 
         router.push({
@@ -335,7 +335,7 @@ export function BasicDeatilsForm({ editMode }) {
         })
 
       } else {
-        alert.error({timeout: 10000}, 'Unable to update facility')
+        alert.error('Unable to update facility')
         setSubmitting(false)
         res.json()
           .then(resp => {
@@ -392,10 +392,10 @@ export function BasicDeatilsForm({ editMode }) {
 
         if (res.status == 201 || res.status == 200) {
           setSubmitting(false)
-          alert.success({timeout: 10000}, 'Facility Added Successfully')
+          alert.success('Facility Added Successfully')
         } else {
           setSubmitting(false)
-          alert.error({timeout: 10000}, 'Unable to Add facility')
+          alert.error('Unable to Add facility')
           res.json()
           .then(resp => {
             const formResponse = []
diff --git a/components/Forms/CommunityUnitsForms.js b/components/Forms/CommunityUnitsForms.js
index 4295f8b8..3344bbbe 100644
--- a/components/Forms/CommunityUnitsForms.js
+++ b/components/Forms/CommunityUnitsForms.js
@@ -152,13 +152,13 @@ function EditCommunityUnitsBasicDeatilsForm(props) {
 
             setSubmitting(false)
             // setFormError(Array.isArray(Object.values(detail)) && Object.values(detail).length == 1 && typeof Object.values(detail)[0] == 'string' && detail[0][0])
-            alert.error({timeout: 10000}, 'Unable to save Community Units Basic details')
+            alert.error('Unable to save Community Units Basic details')
           }
         })
     }
 
     catch (e) {
-      alert.error({timeout: 10000}, 'Error Occured: ' + e.message)
+      alert.error('Error Occured: ' + e.message)
     }
 
 
@@ -695,13 +695,13 @@ function EditCommunityUnitsCHEWSForm(props) {
   
               setSubmitting(false)
               // setFormError(Array.isArray(Object.values(detail)) && Object.values(detail).length == 1 && typeof Object.values(detail)[0] == 'string' && detail[0][0])
-              alert.error({timeout: 10000}, 'Unable to update Community Units healtjh workers')
+              alert.error('Unable to update Community Units healtjh workers')
             }
           })
       }
   
       catch (e) {
-        alert.error({timeout: 10000}, 'Error Occured: ' + e.message)
+        alert.error('Error Occured: ' + e.message)
       }
   }
 
@@ -751,7 +751,7 @@ function EditCommunityUnitsCHEWSForm(props) {
         // setDeleteButton(props?.health_unit_workers.map((_, i) => ({[i]: false})))
 
 
-        alert.success({timeout: 10000}, `${props?.health_unit_workers[index]?.name} has been deleted successfully`)
+        alert.success(`${props?.health_unit_workers[index]?.name} has been deleted successfully`)
       } else {
           resp.json().then(({detail}) => {
           alert.error('Unable to delete health worker', {timeout: 10000})
@@ -922,12 +922,10 @@ function EditCommunityUnitsCHEWSForm(props) {
 
 }
 
-
 function EditCommunityUnitsServicesForm(props) {
 
     const currentServices = props?.services?.map(({name: label, service: value}) => ({label, value})) ?? []
 
-  
     const options = useContext(ChuOptionsContext)
 
     const [submitting, setSubmitting] = useState(false)
diff --git a/components/Forms/FacilityContactsForm.js b/components/Forms/FacilityContactsForm.js
index 893eacf8..c543c46b 100644
--- a/components/Forms/FacilityContactsForm.js
+++ b/components/Forms/FacilityContactsForm.js
@@ -246,7 +246,7 @@ export function FacilityContactsForm() {
                         .then((resp) => {
                             defer(() => updatedSavedChanges(true));
                             if (resp.status == 200 || resp.status == 204) {
-                                alert.success({timeout: 10000}, "Updated facility contacts successfully")
+                                alert.success("Updated facility contacts successfully")
 
                                 router.push({
                                     pathname: '/facilities/facility_changes/[facility_id]',
@@ -257,7 +257,7 @@ export function FacilityContactsForm() {
                             }
 
                             else {
-                                alert.error({timeout: 10000}, "Unable to update facility contacts")
+                                alert.error("Unable to update facility contacts")
                                 resp.json()
                                 .then(resp => {
                                   const formResponse = []
@@ -297,7 +297,7 @@ export function FacilityContactsForm() {
                                     }
                                 })
 
-                                alert.success({timeout: 10000}, 'Officer Incharge Contacts Saved successfully')
+                                alert.success('Officer Incharge Contacts Saved successfully')
 
                                 const formDataBase64Enc = Buffer.from(JSON.stringify(values)).toString('base64')
 
@@ -326,8 +326,8 @@ export function FacilityContactsForm() {
                             }
                             else {
                                 setSubmitting(false)
-                                alert.error({timeout: 10000}, 'Unable to save Facility Contacts')
-                                alert.error({timeout: 10000}, 'Unable to save Officer Incharge Contacts')
+                                alert.error('Unable to save Facility Contacts')
+                                alert.error('Unable to save Officer Incharge Contacts')
 
                                 resp.json()
                                 .then(resp => {
diff --git a/components/Forms/GeolocationForm.js b/components/Forms/GeolocationForm.js
index 594d00fd..b7372dc6 100644
--- a/components/Forms/GeolocationForm.js
+++ b/components/Forms/GeolocationForm.js
@@ -101,7 +101,6 @@ export function GeolocationForm({ editMode }) {
       longitude: Number(data?.longitude),
       facility: options?.data?.id
     }
-
   
       if (payload) {
 
@@ -118,12 +117,14 @@ export function GeolocationForm({ editMode }) {
             if (resp.status == 200 || resp.status == 201) {
               alert.success('Geolocation Detatils saved Successfully', {timeout: 10000})
               setSubmitting(false)
+                         
               router.push({
                 pathname: '/facilities/facility_changes/[facility_id]/',
                 query: { 
                   facility_id: options?.data?.id
                 }
               })
+
             } else {
               alert.error('Unable to save Geolocation Details Successfully', {timeout: 10000})
               setSubmitting(false)
@@ -181,7 +182,7 @@ export function GeolocationForm({ editMode }) {
     })
       .then(res => {
         if (res.status == 204 || res.status == 200) {
-          alert.success({timeout: 10000}, 'Facility Geolocation Details have been saved successfully')
+          alert.success('Facility Geolocation Details have been saved successfully')
 
           setSubmitting(false)
 
@@ -216,7 +217,7 @@ export function GeolocationForm({ editMode }) {
 
         } else {
           setSubmitting(false)
-          alert.error({timeout: 10000}, 'Unable to save to Geolocation details')
+          alert.error('Unable to save to Geolocation details')
 
           res.json()
           .then(resp => {
diff --git a/components/Forms/formComponents/EditListItem.js b/components/Forms/formComponents/EditListItem.js
index d95a91de..6c9368fe 100644
--- a/components/Forms/formComponents/EditListItem.js
+++ b/components/Forms/formComponents/EditListItem.js
@@ -162,7 +162,7 @@ function EditListItem({
           .then(resp => {
             if (resp.status == 200 || resp.status == 204) {
               setSubmitting(false)
-              alert.success({timeout: 10000}, 'Updated facility services successfully');
+              alert.success('Updated facility services successfully');
 
               router.push({
                 pathname: '/facilities/facility_changes/[facility_id]',
@@ -195,7 +195,7 @@ function EditListItem({
         .then(resp => {
           if (resp.status == 200 || resp.status == 204) {
             setSubmitting(false)
-            alert.success({timeout: 10000}, 'Updated Community Health Unit Services successfully');
+            alert.success('Updated Community Health Unit Services successfully');
 
             // router.push({
             //   pathname: '/facilities/facility_changes/[facility_id]',
@@ -232,7 +232,7 @@ function EditListItem({
             if (resp.status == 204 || resp.status == 200) {
               if(itemName == "facility_services") {
               setSubmitting(false)
-              alert.success({timeout: 10000}, 'Facility services saved successfully');
+              alert.success('Facility services saved successfully');
 
               const services = typeof selectedItems == 'string' ? JSON.parse(selectedItems).map(({ rowid }) => ({ service: rowid })) : selectedItems.map(({ rowid }) => ({ service: rowid }))
               const payload = JSON.stringify(services)
@@ -280,7 +280,7 @@ function EditListItem({
             }
             else {
               setSubmitting(false)
-              alert.error({timeout: 10000}, 'Unable to save facility services');
+              alert.error('Unable to save facility services');
 
               resp.json()
               .then(resp => {
@@ -306,7 +306,7 @@ function EditListItem({
           .then(resp => {
             if (resp.status == 204 || resp.status == 200) {
               setSubmitting(false)
-              alert.success({timeout: 10000}, 'Community health unit services saved successfully');
+              alert.success('Community health unit services saved successfully');
               console.log('  Navigating to CHU Details page ... ')
               
               router.push({
@@ -319,7 +319,7 @@ function EditListItem({
             }
             else {
               setSubmitting(false)
-              alert.error({timeout: 10000}, 'Unable to save Community Health Unit Services');
+              alert.error('Unable to save Community Health Unit Services');
 
             }
           })
diff --git a/components/Forms/formComponents/EditListWithCount.js b/components/Forms/formComponents/EditListWithCount.js
index 9bf20ba6..6f67113e 100644
--- a/components/Forms/formComponents/EditListWithCount.js
+++ b/components/Forms/formComponents/EditListWithCount.js
@@ -276,7 +276,7 @@ function EditListWithCount(
                 .then(resp => {
                     if (resp.status == 200 || resp.status == 204) {
                         setSubmitting(false)
-                        alert.success({timeout: 10000}, `Facility ${e.target.name.includes("infrastructure") ? 'Infrastructure' : 'Human resource'} form updated successfully`)
+                        alert.success(`Facility ${e.target.name.includes("infrastructure") ? 'Infrastructure' : 'Human resource'} form updated successfully`)
 
                         router.push({
                             pathname: '/facilities/facility_changes/[facility_id]',
@@ -288,7 +288,7 @@ function EditListWithCount(
 
                     } else {
                         setSubmitting(false)
-                        alert.error({timeout: 10000}, `Unable to update facility ${e.target.name.includes("infrastructure") ? 'Infrastructure' : 'Human resource'}`)
+                        alert.error(`Unable to update facility ${e.target.name.includes("infrastructure") ? 'Infrastructure' : 'Human resource'}`)
                         
                         resp.json()
                         .then(resp => {
@@ -317,13 +317,13 @@ function EditListWithCount(
                     .then(resp => {
                         if (resp.status == 204 || resp.status == 200) {
                             setSubmitting(false)
-                            alert.success({timeout: 10000}, 'Facility humanresource saved successfully')
+                            alert.success('Facility humanresource saved successfully')
 
                             router.push(`/facilities/${itemId}`)
 
                         } else {
                             setSubmitting(false)
-                            alert.error({timeout: 10000}, 'Unable to save facility humanresource')
+                            alert.error('Unable to save facility humanresource')
                             resp.json()
                             .then(resp => {
                                 const formResponse = []
@@ -347,7 +347,7 @@ function EditListWithCount(
                 .then(resp => {
                     if (resp.status == 204 || resp.status == 200) {
                         setSubmitting(false)
-                        alert.success({timeout: 10000}, 'Facility Infrastructure saved successfully')
+                        alert.success('Facility Infrastructure saved successfully')
 
                         const infrastructure = selectedRows.map(({ rowid }) => ({ service: rowid }))
 
@@ -381,7 +381,7 @@ function EditListWithCount(
                     } else {
 
                         setSubmitting(false)
-                        alert.error({timeout: 10000}, 'Unable to save facility infrastructure')
+                        alert.error('Unable to save facility infrastructure')
                         resp.json()
                         .then(resp => {
                             const formResponse = []
diff --git a/components/Forms/formComponents/FacilityContacts.js b/components/Forms/formComponents/FacilityContacts.js
index a947a023..8ebad3c5 100644
--- a/components/Forms/formComponents/FacilityContacts.js
+++ b/components/Forms/formComponents/FacilityContacts.js
@@ -85,7 +85,7 @@ const FacilityContact = ({contactTypeOptions, setFacilityContacts, index, fieldN
                             try{
                                 if(contactTypeRef?.current) {
                                 const resp = await fetch(`/api/common/submit_form_data/?path=delete_contact&id=${contactTypeRef?.current?.state?.value[0].id ?? null}`)
-                                if(resp.status == 204) alert.success({timeout: 10000}, 'Deleted Facility Contact Successfully')
+                                if(resp.status == 204) alert.success('Deleted Facility Contact Successfully')
 
                     
                                 }
diff --git a/components/Forms/formComponents/FacilityDepartmentUnits.js b/components/Forms/formComponents/FacilityDepartmentUnits.js
index 0e054a50..416c14bf 100644
--- a/components/Forms/formComponents/FacilityDepartmentUnits.js
+++ b/components/Forms/formComponents/FacilityDepartmentUnits.js
@@ -9,10 +9,12 @@ export default function FacilityDepartmentUnits({facilityDeptOptions,  setFacili
  
     const facilityDepts = useContext(FacilityDepartmentUnitsContext);
 
-   
+    console.log(facilityDepts)
+    
 
     return (
         <> 
+        
       
             {/* Name */}
             <Select options={facilityDeptOptions || []} 
@@ -36,7 +38,10 @@ export default function FacilityDepartmentUnits({facilityDeptOptions,  setFacili
             onClick={(ev) => {
                 ev.preventDefault();
                 facilityDepts.splice(index, 1);
-                setFacilityDepts(facilityDepts);
+                // setFacilityDepts(prev => {
+                //     return prev.filter(({id}) => id )
+                // });
+                return facilityDepts
 
             }}><XCircleIcon className='w-7 h-7 text-red-400' /></button>
 
diff --git a/controllers/facility/approveRejectFacility.js b/controllers/facility/approveRejectFacility.js
index 889350ba..75c32309 100644
--- a/controllers/facility/approveRejectFacility.js
+++ b/controllers/facility/approveRejectFacility.js
@@ -1,17 +1,15 @@
 
 import router from "next/router"
 
-const validateRejectFacility = (facility_id, reject, comment, alert) => {
+function validateRejectFacility (facility_id, reject, comment, alert, token, setSubmitting, setRejecting, setFormError) {
 
     
-    let url = `/api/common/submit_form_data/?path=validate_facility`
 
-
-    try {
-        fetch(url, {
+        fetch(`${process.env.NEXT_PUBLIC_API_URL}/facilities/facility_approvals/`, {
             headers: {
                 'Accept': 'application/json, text/plain, */*',
-                'Content-Type': 'application/json;charset=utf-8'
+                'Content-Type': 'application/json;charset=utf-8',
+                'Authorization': `Bearer ${token}`
 
             },
             method: 'POST',
@@ -21,42 +19,51 @@ const validateRejectFacility = (facility_id, reject, comment, alert) => {
                 is_cancelled: reject,
             })
         })
-            .then(resp => resp)
-            .then(res => {
+         .then(resp => {
 
-                if (res.status == 200) {
+                if (resp.status == 200 || resp.status == 201) {
+                    setSubmitting(false)
                     if (!reject) {
-                        alert.success({timeout: 10000}, "Facility validated successfully")
+                        alert.success("Facility validated successfully")
                     } else {
-                        alert.success({timeout: 10000}, "Facility rejected successfully")
+                        alert.success("Facility rejected successfully")
                     }
                     router.push('/facilities?qf=new_pending_validation&pending_approval=true&has_edits=false&is_complete=true') // redirect to New Facilties Pending Validation
+                } else {
+                    setRejecting(false)
+
+                    resp.json()
+                    .then(resp => {
+                        const formResponse = []
+                        setFormError(() => {
+                          if(typeof resp == 'object') {
+                            const respEntry = Object.entries(resp)
+            
+                            for (let [_, v] of respEntry) {
+                              formResponse.push(v)
+                            }
+            
+                            return `Error: ${formResponse.join(" ")}`
+                          }
+                        })
+                    })
                 }
 
             })
             .catch(e => {
                 console.error(e.message)
             })
-    } catch (e) {
-
-        console.error(e.message)
-
-    }
+    
 
 }
 
-const approveRejectFacility = (facility_id, comment, alert, reject) => {
-
+function approveRejectFacility (facility_id, comment, alert, reject, token, setSubmitting, setRejecting, setFormError) {
 
-   
-
-
-    let url = `/api/common/submit_form_data/?path=validate_facility`
-    try {
-        fetch(url, {
+        fetch(`${process.env.NEXT_PUBLIC_API_URL}/facilities/facility_approvals/`, {
             headers: {
                 'Accept': 'application/json, text/plain, */*',
-                'Content-Type': 'application/json;charset=utf-8'
+                'Content-Type': 'application/json;charset=utf-8',
+                'Authorization': `Bearer ${token}`
 
             },
             method: 'POST',
@@ -67,16 +74,34 @@ const approveRejectFacility = (facility_id, comment, alert, reject) => {
                 is_national_approval: reject,
             })
         })
-            .then(resp => resp)
-            .then(res => {
+            .then(resp => {
 
-                if (res) {
+                if (resp.status == 200 || resp.status == 201) {
+                    setSubmitting(false)
                     if (reject) {
-                        alert.success({timeout: 10000}, `Facility Approved successfully`)
+                        alert.success(`Facility Approved successfully`)
                     } else {
-                        alert.success({timeout: 10000}, `Facility Rejected successfully`)
+                        alert.success(`Facility Rejected successfully`)
                     }
+                    
                     router.push('/facilities?qf=approved&approved=true&approved_national_level=true&rejected=false') // redirect Facilties Pending Approval
+                } else {
+                    setRejecting(false)
+                    resp.json()
+                    .then(resp => {
+                        const formResponse = []
+                        setFormError(() => {
+                          if(typeof resp == 'object') {
+                            const respEntry = Object.entries(resp)
+            
+                            for (let [_, v] of respEntry) {
+                              formResponse.push(v)
+                            }
+            
+                            return `Error: ${formResponse.join(" ")}`
+                          }
+                        })
+                    })
                 }
 
 
@@ -84,58 +109,63 @@ const approveRejectFacility = (facility_id, comment, alert, reject) => {
             .catch(e => {
                 console.error(e.message)
             })
-    } catch (e) {
-
-        console.error(e)
-    }
+    
 
 
 
 }
 
-const approveRejectFacilityUpdates = (reject, alert, update_id) => {
+function approveRejectFacilityUpdates (reject, alert, update_id, token, setSubmitting, setRejecting, setFormError) {
 
-  
-
-    let url = `/api/common/submit_form_data/?path=approve_reject_facility_updates&id=${update_id}`
-
-
-    try {
-        fetch(url, {
+ 
+        fetch(`${process.env.NEXT_PUBLIC_API_URL}/facilities/facility_updates/${update_id}/`, {
             headers: {
                 'Accept': 'application/json, text/plain, */*',
-                'Content-Type': 'application/json;charset=utf-8'
+                'Content-Type': 'application/json;charset=utf-8',
+                'Authorization': `Bearer ${token}`
 
             },
-            method: 'POST',
+            method: 'PATCH',
             body: JSON.stringify({
                 approved: reject
             })
         })
-            .then(resp => resp)
-            .then(res => {
-
-                if (res) {
+            .then(resp => {
+                if (resp.status == 200 || resp.status == 204) {
 
                     if (reject) {
-                        alert.success({timeout: 10000}, "Facility updates approved successfully")
+                        setSubmitting(false)
+                        alert.success("Facility updates approved successfully")
                     } else {
-                        alert.success({timeout: 10000}, "Facility updates rejected successfully")
+                        alert.success("Facility updates rejected successfully")
                     }
 
                     router.push('/facilities?qf=updated_pending_validation&has_edits=true&pending_approval=true') // redirect to New Facilties Pending Validation
+                } else {
+                    setRejecting(false)
+
+                    resp.json()
+                    .then(resp => {
+                        const formResponse = []
+                        setFormError(() => {
+                          if(typeof resp == 'object') {
+                            const respEntry = Object.entries(resp)
+            
+                            for (let [_, v] of respEntry) {
+                              formResponse.push(v)
+                            }
+            
+                            return `Error: ${formResponse.join(" ")}`
+                          }
+                        })
+                    })
                 }
 
             })
             .catch(e => {
                 console.error(e.message)
             })
-    } catch (e) {
-
-        console.error(e.message)
-
-    }
-
+ 
 }
 
 export {
diff --git a/controllers/facility/facilityHandlers.js b/controllers/facility/facilityHandlers.js
index 00f286d3..71420558 100644
--- a/controllers/facility/facilityHandlers.js
+++ b/controllers/facility/facilityHandlers.js
@@ -94,7 +94,7 @@ async function handleBasicDetailsSubmit(token, values, formId, setFormId, fileRe
 
                     if (resp.status == 201 && formData.get('fyl')) {
 
-                        alert.success({timeout: 10000}, 'Basic details saved successful');
+                        alert.success('Basic details saved successful');
 
                         try {
                             const resp = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/common/documents/`, {
@@ -114,7 +114,7 @@ async function handleBasicDetailsSubmit(token, values, formId, setFormId, fileRe
                         }
                     }
                     else {
-                        alert.error({timeout: 10000}, 'Unable to save basic details successfully!')
+                        alert.error('Unable to save basic details successfully!')
                     }
                 })
                 //  fetch data for Geolocation form
@@ -161,7 +161,7 @@ async function handleBasicDetailsSubmit(token, values, formId, setFormId, fileRe
         }
     }
     else {
-        alert.error({timeout: 10000}, 'Access Token not supplied !')
+        alert.error('Access Token not supplied !')
     }
 
 
@@ -459,7 +459,7 @@ async function handleRegulationSubmit(token, values, facilityId, setSubmitting,
 
     //         if (resp.status == 204 || resp.status == 200) {
     //             setSubmitting(false)
-    //             alert.success({timeout: 10000}, 'Facilty Regulation details saved successfully')
+    //             alert.success('Facilty Regulation details saved successfully')
 
     //             const formDataBase64Enc = Buffer.from(JSON.stringify(values)).toString('base64')
 
@@ -476,7 +476,7 @@ async function handleRegulationSubmit(token, values, facilityId, setSubmitting,
     //               })
     //         } else {
     //             setSubmitting(false)
-    //             alert.error({timeout: 10000}, 'unable to save Regulation details ')
+    //             alert.error('unable to save Regulation details ')
     //         }
     //     } catch (e) {
     //         console.error('Unable to patch facility contacts details', e.message)
@@ -525,7 +525,7 @@ async function handleRegulationSubmit(token, values, facilityId, setSubmitting,
 
                             setSubmitting(false)
 
-                            alert.success({timeout: 10000}, 'License Document saved successfully')
+                            alert.success('License Document saved successfully')
 
                         }
 
@@ -894,7 +894,7 @@ async function handleRegulationUpdates(token, values, facilityId, licenseFileRef
                     // console.log({resp})
                     if (resp.status == 200 || resp.status == 204) {
 
-                        alert.success({timeout: 10000}, 'Facility Regulation Details updated successfully')
+                        alert.success('Facility Regulation Details updated successfully')
                         setSubmitting(false)
 
                         router.push({
@@ -906,7 +906,7 @@ async function handleRegulationUpdates(token, values, facilityId, licenseFileRef
                     }
                     else {
                         setSubmitting(false)
-                        alert.error({timeout: 10000}, 'Unable to update regulation form')
+                        alert.error('Unable to update regulation form')
                     //     const response = resp.json()
                     //     if(response) {
                     //     response    
@@ -1050,9 +1050,9 @@ async function handleInfrastructureDelete(token, event, facility_infrastructure_
     try {
 
         if (facility_infrastructure_id) {
-            alert.success({timeout: 10000}, 'Facility Infrastructure Deleted Successfully')
+            alert.success('Facility Infrastructure Deleted Successfully')
         } else {
-            alert.error({timeout: 10000}, "Unable to delete facility infrastructure")
+            alert.error("Unable to delete facility infrastructure")
         }
 
         const resp = await fetch(`/api/common/submit_form_data/?path=delete_facility_infrastructure&id=${facility_infrastructure_id}`, {
@@ -1137,9 +1137,9 @@ async function handleHrDelete(event, facility_hr_id, alert) {
         })
 
         if (resp.ok) {
-            alert.success({timeout: 10000}, 'Facility Human resource Deleted Successfully')
+            alert.success('Facility Human resource Deleted Successfully')
         } else {
-            alert.error({timeout: 10000}, "Unable to delete facility Human resource")
+            alert.error("Unable to delete facility Human resource")
         }
 
         return resp
@@ -1171,9 +1171,9 @@ async function handleFacilityUpgrades(payload, alert) {
 
         if (resp.ok) {
             localStorage.clear()
-            alert.success({timeout: 10000}, 'Facility Upgraded Successfully')
+            alert.success('Facility Upgraded Successfully')
         } else {
-            alert.error({timeout: 10000}, "Unable to upgrade facility")
+            alert.error("Unable to upgrade facility")
         }
 
 
@@ -1185,127 +1185,6 @@ async function handleFacilityUpgrades(payload, alert) {
     }
 }
 
-async function handleRegulationSubmitUpdates(values, facilityId, file, formRef) {
-
-
-
-    let facility_name = ''
-
-    if (window) {
-        facility_name = JSON.parse(JSON.parse(window.localStorage.getItem('basic_details_form')))?.official_name
-    }
-
-    const formData = new FormData(formRef.current)
-
-    const facilityDeptEntries = [...formData.entries()]
-
-    const filteredDeptUnitEntries = facilityDeptEntries.filter(field => field[0].match(/^facility_.+$/) !== null)
-
-    const filteredDeptOtherEntries = facilityDeptEntries.filter(field => !(field[0].match(/^facility_.+$/) !== null))
-
-    const payload = ((unitEntries, otherEntries) => {
-
-
-        // Facility Regulation form data
-        const _payload = []
-        const _otherEntObj = {}
-
-        for (let e in otherEntries) _otherEntObj[otherEntries[e][0]] = otherEntries[e][1]
-
-        delete _otherEntObj.license_document;
-
-        _payload.push(_otherEntObj)
-
-        // Facility Dept Regulation
-
-        const _unitEntArrObjs = unitEntries.filter(ar => ar[0] === 'facility_unit').map(() => Object())
-
-        let p = 0;
-
-        for (let i in unitEntries) {
-            // clean up the key by removing prefix facility_
-            _unitEntArrObjs[p][
-                unitEntries[i][0].replace('facility_', '')
-            ] = unitEntries[i][1];
-
-            if (unitEntries[i][0] == 'facility_registration_number') {
-                p += 1
-            }
-        }
-
-        _payload.push({
-            units: _unitEntArrObjs
-        })
-
-        return _payload
-
-
-    })(filteredDeptUnitEntries, filteredDeptOtherEntries)
-
-
-
-    // console.log({payload})
-
-    payload.forEach(data => {
-        try {
-            fetch(`/api/common/submit_form_data/?path=basic_details_update&id=${facilityId}`, {
-
-                headers: {
-                    'Accept': 'application/json, text/plain, */*',
-                    'Content-Type': 'application/json;charset=utf-8'
-
-                },
-                method: 'POST',
-                body: JSON.stringify(data)
-
-            })
-
-
-                // Post the license document
-                .then(async resp => {
-
-                    const formData = new FormData()
-                    formData.append('name', `${facility_name} Facility license File`)
-                    formData.append('description', 'Facilities license file')
-                    formData.append('document_type', 'FACILITY_LICENSE')
-                    formData.append('facility_name', facility_name)
-                    formData.append('fyl', file?.files[0] ?? undefined)
-
-
-                    if (resp) {
-
-                        try {
-                            const resp = await fetch('/api/common/submit_form_data/?path=documents', {
-
-                                headers: {
-                                    'Accept': 'application/json, text/plain, */*',
-                                },
-                                method: 'POST',
-                                body: formData
-                            })
-                            console.log("Here is the response", { resp }) // debug
-
-                            alert('Facility Regulation Details Updated Successfully')
-
-                            if (resp.ok) {
-                                localStorage.clear()
-                            }
-
-                            return resp
-                        }
-                        catch (e) {
-                            console.error('Unable to Post License Document')
-                        }
-                    }
-                })
-
-        }
-        catch (e) {
-            console.error('Unable to patch facility regulation updates', e.message)
-        }
-    })
-
-};
 
 
 
@@ -1318,7 +1197,6 @@ export {
     handleInfrastructureSubmit,
     handleHrSubmit,
     handleBasicDetailsUpdates,
-    // handleGeolocationUpdates,
     handleFacilityContactsUpdates,
     handleRegulationUpdates,
     handleServiceUpdates,
@@ -1328,6 +1206,4 @@ export {
     handleServiceDelete,
     handleHrDelete,
     handleInfrastructureDelete,
-    handleRegulationSubmitUpdates
-
 }
\ No newline at end of file
diff --git a/pages/account.js b/pages/account.js
index ccb3ba91..d2731a5e 100644
--- a/pages/account.js
+++ b/pages/account.js
@@ -131,7 +131,7 @@ const Account = () => {
                         if(res.id !==undefined ){
 
                             router.push({pathname:'/user'})
-                            alert.success({timeout: 10000}, editMode? 'User updated successfully':'User added successfully')
+                            alert.success(editMode? 'User updated successfully':'User added successfully')
         
                         }else{
                             setStatus({status:'error', message: res})
diff --git a/pages/api/common/submit_form_data.js b/pages/api/common/submit_form_data.js
index 75958b1f..6f9b3edf 100644
--- a/pages/api/common/submit_form_data.js
+++ b/pages/api/common/submit_form_data.js
@@ -122,17 +122,7 @@ export default async function submitFormData(req, res) {
                 contentType = 'application/json;charset=utf-8';
                 method = 'DELETE';
                 break
-            case `validate_facility`:
-                url = `${API_URL}/facilities/facility_approvals/`
-                contentType = 'application/json;charset=utf-8';
-                method = 'POST';
-                break
-            case `approve_reject_facility_updates`:
-                url = `${API_URL}/facilities/facility_updates/${req.query.id}/`
-                contentType = 'application/json;charset=utf-8';
-                method = 'PATCH';
-                break
-            case `approve_chul`:
+             case `approve_chul`:
                 url = `${API_URL}/chul/units/${req.query.id}/`
                 contentType = 'application/json;charset=utf-8';
                 method = 'PATCH';
diff --git a/pages/community-units/add.js b/pages/community-units/add.js
index 147df565..10f3a084 100644
--- a/pages/community-units/add.js
+++ b/pages/community-units/add.js
@@ -114,13 +114,13 @@ function CommunityUnitsBasciDetailsForm(props) {
 
 						setSubmitting(false)
 						setFormError(Array.isArray(Object.values(detail)) &&  Object.values(detail).length == 1 && typeof Object.values(detail)[0] == 'string' && detail[0][0])
-						alert.error({timeout: 10000}, 'Unable to save Community Units Basic details')
+						alert.error('Unable to save Community Units Basic details')
 					}
 				})
 		}
 
 		catch (e) {
-			alert.error({timeout: 10000}, 'Error Occured: ' + e.message)
+			alert.error('Error Occured: ' + e.message)
 		}
 
 	};
@@ -715,12 +715,12 @@ function CommunityUnitsExtensionWorkersForm(props) {
 
 						setSubmitting(false)
 						setFormError(Array.isArray(Object.values(detail)) &&  Object.values(detail).length == 1 && typeof Object.values(detail)[0] == 'string' && detail[0][0])
-						alert.error({timeout: 10000}, 'Unable to save Community Units Extension Workers')
+						alert.error('Unable to save Community Units Extension Workers')
 					}
 				})
 			}
 			catch (e) {
-				alert.error({timeout: 10000}, 'An error occured: ' + e.message)
+				alert.error('An error occured: ' + e.message)
 
 				console.error(e.message)
 			}
diff --git a/pages/facilities/[id].js b/pages/facilities/[id].js
index 3db9db9a..07ddd475 100644
--- a/pages/facilities/[id].js
+++ b/pages/facilities/[id].js
@@ -190,7 +190,7 @@ const Facility = (props) => {
                             
 
                               if(resp.ok){
-                                  alert.success({timeout: 10000}, "Facility Reopened successfully")
+                                  alert.success("Facility Reopened successfully")
                                   _.defer(() => {
                                     handleClose()
 
@@ -296,7 +296,7 @@ const Facility = (props) => {
                         
                             
                           if(resp.ok){
-                              alert.success({timeout: 10000}, "Facility Closed successfully")
+                              alert.success("Facility Closed successfully")
                               _.defer(() => {
                                 handleCloseModal()
 
diff --git a/pages/facilities/approve_reject/[id].js b/pages/facilities/approve_reject/[id].js
index 841015a4..bf006391 100644
--- a/pages/facilities/approve_reject/[id].js
+++ b/pages/facilities/approve_reject/[id].js
@@ -23,7 +23,8 @@ import FacilityDetailsTabs from '../../../components/FacilityDetailsTabs';
 import { Formik, Form, Field } from 'formik';
 import { useAlert } from 'react-alert'
 import { UserContext } from '../../../providers/user';
-
+import { Alert } from '@mui/lab'
+import Spinner from '../../../components/Spinner'
 
 function ApproveReject(props) {
   const userCtx = useContext(UserContext);
@@ -41,17 +42,19 @@ function ApproveReject(props) {
   const [pathId, setPathId] = useState('')
   const [allFctsSelected, setAllFctsSelected] = useState(false);
   const [title, setTitle] = useState('')
+  const [submitting, setSubmitting] = useState(false)
+  const [rejecting, setRejecting] = useState(false)
+  const [formError, setFormError] = useState(null)
 
 
-  const facility = props["0"]?.data;
-  const { facility_updated_json } = props["2"]?.updates ?? { facility_updated_json: null };
+  const facility = props?.data;
+  const { facility_updated_json } = props?.updates ?? { facility_updated_json: null };
   const filters = []
   // const [reject, setReject] = useState(null)
 
 
   const [isClient, setIsClient] = useState(false)
-
-
+  const [reject, setReject] = useState(null)
 
   useEffect(() => {
     setUser(userCtx)
@@ -61,8 +64,8 @@ function ApproveReject(props) {
 
     setIsClient(true)
   }, [])
+  
 
-  let reject
 
   if (isClient) {
     return (
@@ -168,6 +171,7 @@ function ApproveReject(props) {
               </div>
               <div className="col-span-6 md:col-span-1 flex flex-col items-center justify-center p-2"></div>
             </div>
+
           </div>
 
           {/* Facility Side Menu Filters */}
@@ -246,6 +250,7 @@ function ApproveReject(props) {
               )}
             </div>
 
+           
 
             {/* Facility details hidden section */}
 
@@ -290,18 +295,19 @@ function ApproveReject(props) {
                   comment: ''
                 }}
                 onSubmit={async ({ comment }) => {
+                  
                   // if facility is not validated and has no edits
                   if (!facility?.approved && !facility?.has_edits) {
-                    validateRejectFacility(facility?.id, reject, comment, alert)
+                    validateRejectFacility(facility?.id, reject, comment, alert, props?.token, setSubmitting, setRejecting, setFormError)
                   }
                   // if facility is validated and has edits
                   if (facility?.approved && facility?.has_edits) {
-                    approveRejectFacilityUpdates(reject, alert, facility?.latest_update)
+                    approveRejectFacilityUpdates(reject, alert, facility?.latest_update, props?.token, setSubmitting, setRejecting, setFormError)
                   }
                   // if facility is not approved and is validated
                   if (!facility?.approved_national_level && facility?.approved) {
                     // console.log('FACILITY WILL BE APPROVED')
-                    approveRejectFacility(facility?.id, comment, alert, reject)
+                    approveRejectFacility(facility?.id, comment, alert, reject, props?.token, setSubmitting, setRejecting, setFormError)
                   }
                 }
                 }
@@ -309,6 +315,10 @@ function ApproveReject(props) {
                 <Form
                   className="space-y-3"
                 >
+                   {/* Alert Section */}
+            
+                  {formError && <Alert severity='error' className='w-full'>{formError}</Alert>}
+
 
                   {
                     !facility?.has_edits ?
@@ -332,20 +342,40 @@ function ApproveReject(props) {
                     <button
                       type="submit"
                       className="bg-blue-600  text-gray-100 -md p-2 font-semibold"
-                      onClick={() => reject = facility?.has_edits ? true : facility?.is_approved ? true : false}
+                      onClick={() => {setSubmitting(true); setReject(facility?.has_edits ? true : facility?.is_approved ? true : false)}}
 
                     >
-                      {facility?.has_edits ? 'Approve Updates' : facility?.is_approved ? facility?.approved_national_level ? "Reject Facility" : "Approve Facility" : "Validate Facility"}
+                      {
+                       submitting ? 
+                       <div className='flex items-center gap-2'> 
+                         <Spinner />
+                         <span className='text-white'>{
+                            facility?.has_edits ? 'Approving updates...' : facility?.is_approved ? facility?.approved_national_level ? "Rejecting facility...": "Approving facility..." : "Validating facility..."
+                         } </span>
+                       </div>
+                       :
+                      facility?.has_edits ? 'Approve Updates' : facility?.is_approved ? facility?.approved_national_level ? "Reject Facility" : "Approve Facility" : "Validate Facility"
+                      }
                     </button>
 
                     {!facility?.approved_national_level &&
                       <button
                         type="submit"
                         className="bg-red-600  text-gray-100 -md p-2 font-semibold"
-                        onClick={() => reject = facility?.has_edits ? false : facility?.is_approved ? false : true}
+                        onClick={() => { setRejecting(true);  setReject(facility?.has_edits ? false : facility?.is_approved ? false : true)}}
 
                       >
-                        {facility?.has_edits ? 'Decline Updates' : facility?.approved_national_level ? '' : 'Reject Facility'}
+                        {
+                        rejecting ? 
+                        <div className='flex items-center gap-2'> 
+                          <Spinner />
+                          <span className='text-white'>{
+                             facility?.has_edits ? 'Declining Updates ...' : facility?.approved_national_level ? '' : 'Rejecting Facility... '
+                          } </span>
+                        </div>
+                        :
+                        facility?.has_edits ? 'Decline Updates' : facility?.approved_national_level ? '' : 'Reject Facility'
+                        }
                       </button>
                     }
                   </div>
@@ -364,7 +394,7 @@ function ApproveReject(props) {
 }
 
 ApproveReject.getInitialProps = async (ctx) => {
-  const allOptions = [];
+  const allOptions = {};
 
   if (ctx.query.q) {
     const query = ctx.query.q;
@@ -400,9 +430,8 @@ ApproveReject.getInitialProps = async (ctx) => {
         })
           .then((r) => r.json())
           .then(async (json) => {
-            allOptions.push({
-              data: json,
-            })
+            allOptions['data'] = json;
+            allOptions['token'] = token;
 
 
             // fetch ward boundaries
@@ -423,10 +452,10 @@ ApproveReject.getInitialProps = async (ctx) => {
                 const [lng, lat] =
                   _data?.ward_boundary.properties.center.coordinates;
 
-                allOptions.push({
+                allOptions['ward'] = {
                   geoLocation: JSON.parse(JSON.stringify(_data?.ward_boundary)),
                   center: [lat, lng],
-                });
+                };
               } catch (e) {
                 console.error("Error in fetching ward boundaries", e.message);
               }
@@ -444,9 +473,8 @@ ApproveReject.getInitialProps = async (ctx) => {
                   }
                 )).json()
 
-                allOptions.push({
-                  updates: facilityUpdateData,
-                })
+                allOptions['updates'] = facilityUpdateData;
+                
 
               }
               catch (e) {
diff --git a/pages/facilities/edit/[id].js b/pages/facilities/edit/[id].js
index d8371c71..1c68b3af 100644
--- a/pages/facilities/edit/[id].js
+++ b/pages/facilities/edit/[id].js
@@ -149,9 +149,9 @@ export default function EditFacility(props) {
 											className="flex justify-center text-base font-semibold text-white bg-blue-500  py-1 px-2"
 											onClick={() => {
 												if (isSavedChanges) {
-													alert.success({timeout: 10000}, "Facility updates saved successfully")
+													alert.success("Facility updates saved successfully")
 												} else {
-													alert.error({timeout: 10000}, "Unable to save facility updates")
+													alert.error("Unable to save facility updates")
 												}
 												router.push("/facilities")
 											}}
diff --git a/pages/facilities/facility_changes/[id].js b/pages/facilities/facility_changes/[id].js
index 3128d450..b7d7b51a 100644
--- a/pages/facilities/facility_changes/[id].js
+++ b/pages/facilities/facility_changes/[id].js
@@ -45,14 +45,16 @@ export default function FacilityChanges({ facility }) {
 
                     <div className="md:col-span-4 bg-blue-50 p-6 shadow-md flex flex-col items-center md:gap-3 gap-y-3">
 
-                        <div className="flex flex-col justify-start w-full space-y-3">
+                        <div className="flex flex-col justify-start w-full gap-3">
                             <h2 className="text-2xl font-bold justify-center items-center md:ml-0 ml-4">
                                 Updated details
                             </h2>
+
+                            
                             {/* Update Metadata */}
-                            <div className="grid grid-cols-1 gap-y-2 grid-rows-1 md:flex justify-between md:space-x-4 w-full md:mx-0 mx-4">
+                            <div className="flex justify-between items-center gap-3 w-full md:mx-0 mx-4">
                                 <p className="text-base font-normal flex items-center gap-x-1">
-                                    Updates were made on {" "}
+                                    Updated at {": "}
                                     <span className="text-blue-900 font-semibold text-base ">
                                         {
                                             facility?.changes?.updated ?
@@ -62,13 +64,41 @@ export default function FacilityChanges({ facility }) {
                                             : '-'
                                         }
                                     </span>
-                                    {" "}
-                                    by
-                                    {" "}
+                                  
+                                </p>
+
+                                <span className="flex space-x-2">
+                                    <button
+                                        className="flex justify-center text-base font-semibold text-white bg-blue-500  py-1 px-2"
+                                        onClick={() => router.push(`/facilities/edit/${facility?.data?.id}`)}
+                                    >
+                                        Edit
+                                    </button>
+                                    <button
+                                        className="flex justify-center text-base font-semibold text-white bg-blue-500  py-1 px-2"
+                                        onClick={() => {
+
+                                            alert.success("Facility updates saved successfully")
+                                            router.push("/facilities")
+                                        }}
+                                    >
+                                        Confirm Updates
+                                    </button>
+                                 </span>
+
+                            </div>
+
+                            <div className="flex justify-start items-center gap-3 w-full md:mx-0 mx-4">
+                            <p className="text-base font-normal flex items-center gap-x-1">
+                                    Updated by {": "}
                                     <span className="text-blue-900 font-semibold text-base ">
                                         {facility?.changes?.created_by_name}
                                     </span>
-                                </p>
+                            </p>
+                            </div>
+
+
+                            <div className="flex justify-start items-center gap-3 w-full md:mx-0 mx-4">
 
                                 <p className="text-base font-normal flex gap-x-1 ">
                                     Facility :
@@ -78,34 +108,23 @@ export default function FacilityChanges({ facility }) {
                                     </span>
                                 </p>
                              
-                                <p className="text-base font-normal flex gap-x-1 ">
+                            </div>
+
+                            <div  className="flex justify-start items-center gap-3 w-full md:mx-0 mx-4">
+
+                            <p className="text-base font-normal flex gap-x-1 ">
                                     Facility Code:
                                     {" "}
                                     <span className="text-blue-900 font-semibold text-base ">
                                         {facility?.data?.code ?? '-'}
                                     </span>
                                 </p>
+                            </div>
 
+                            {/* <div className="flex items-center justify-end gap-3 w-full">
+                                
 
-                                <span className="flex space-x-2">
-                                    <button
-                                        className="flex justify-center text-base font-semibold text-white bg-blue-500  py-1 px-2"
-                                        onClick={() => router.push(`/facilities/edit/${facility?.data?.id}`)}
-                                    >
-                                        Edit
-                                    </button>
-                                    <button
-                                        className="flex justify-center text-base font-semibold text-white bg-blue-500  py-1 px-2"
-                                        onClick={() => {
-
-                                            alert.success({timeout: 10000}, "Facility updates saved successfully")
-                                            router.push("/facilities")
-                                        }}
-                                    >
-                                        Confirm Updates
-                                    </button>
-                                </span>
-                            </div>
+                            </div> */}
 
                             {/* Update Details */}
 
@@ -156,6 +175,8 @@ export async function getServerSideProps(ctx) {
 
     const facility = await fetchFacility(ctx?.query?.id)
 
+    // console.log(JSON.stringify(facility?.latest_update, null, 2))
+
 
     return {
         props: {
diff --git a/pages/system_setup/index.js b/pages/system_setup/index.js
index fe053adc..46530da9 100644
--- a/pages/system_setup/index.js
+++ b/pages/system_setup/index.js
@@ -906,7 +906,7 @@ const system_setup = (props) => {
                 if(data.details){
                     alert.danger('Error: '+data.details)
                   }else{
-                    alert.success({timeout: 10000},  (editMode? 'Updated' : 'Added') +' Successfully')
+                    alert.success( (editMode? 'Updated' : 'Added') +' Successfully')
                   }
             })
        } catch (error) {
@@ -2565,7 +2565,7 @@ const system_setup = (props) => {
                                                                             if(data.details){
                                                                                 alert.danger('Error: '+data.details)
                                                                             }else{
-                                                                                alert.success({timeout: 10000},  (editMode? 'Updated' : 'Added') +' Successfully')
+                                                                                alert.success( (editMode? 'Updated' : 'Added') +' Successfully')
                                                                             }
                                                                         })
                                                                 } catch (error) {
diff --git a/pages/user/add.js b/pages/user/add.js
index 2a7e75f1..a6505072 100644
--- a/pages/user/add.js
+++ b/pages/user/add.js
@@ -121,7 +121,7 @@ const User = (props) => {
 					if (res.id !== undefined) {
 
 						router.push({ pathname: '/user' })
-						alert.success({timeout: 10000}, editMode ? 'User updated successfully' : 'User added successfully')
+						alert.success(editMode ? 'User updated successfully' : 'User added successfully')
 
 					} else {
 						setStatus({ status: 'error', message: res })
@@ -149,7 +149,7 @@ const User = (props) => {
 				.then(res => {
 
 					router.push('/user/')
-					alert.success({timeout: 10000}, 'User deleted successfully')
+					alert.success('User deleted successfully')
 				})
 
 		} catch (error) {
diff --git a/pages/user/edit/[id].js b/pages/user/edit/[id].js
index c7c48632..cc0a4ff6 100644
--- a/pages/user/edit/[id].js
+++ b/pages/user/edit/[id].js
@@ -123,7 +123,7 @@ const User = (props) => {
 					if (res.id !== undefined) {
 
 						router.push({ pathname: '/user' })
-						alert.success({timeout: 10000}, editMode ? 'User updated successfully' : 'User added successfully')
+						alert.success(editMode ? 'User updated successfully' : 'User added successfully')
 
 					} else {
 						setStatus({ status: 'error', message: res })
@@ -153,7 +153,7 @@ const User = (props) => {
 				.then(res => {
 
 					router.push('/user/')
-					alert.success({timeout: 10000}, 'User deleted successfully')
+					alert.success('User deleted successfully')
 				})
 
 		} catch (error) {
diff --git a/pages/user/groups/add.js b/pages/user/groups/add.js
index e87d94f0..2ecb9324 100644
--- a/pages/user/groups/add.js
+++ b/pages/user/groups/add.js
@@ -60,7 +60,7 @@ const AddGroup = (props)=> {
 			.then(res => {
 				if(res.id !==undefined ){
 					router.push({pathname:'/user/groups'})
-					alert.success({timeout: 10000}, 'Group added successfully ')
+					alert.success('Group added successfully ')
 				}else{
 					alert.danger('Failed to add group')
 				}
diff --git a/pages/user/groups/edit/[id].js b/pages/user/groups/edit/[id].js
index 42656389..7ee42213 100644
--- a/pages/user/groups/edit/[id].js
+++ b/pages/user/groups/edit/[id].js
@@ -64,7 +64,7 @@ const EditGroup=(props)=> {
 			.then(res => {
 				if(res.id !==undefined ){
 					router.push({pathname:'/user/groups'})
-					alert.success({timeout: 10000}, 'Group updated successfully ')
+					alert.success('Group updated successfully ')
 				}else{
 					setStatus({status:'error', message: res})
 				}
@@ -86,7 +86,7 @@ const EditGroup=(props)=> {
 			.then(resp =>resp)
 			.then(res => {
 					router.push('/user/groups')
-					alert.success({timeout: 10000}, 'Group deleted successfully ')
+					alert.success('Group deleted successfully ')
 			})
 			
 		} catch (error) {