diff --git a/src/components/Project/Infrastructure/BuildingModel.jsx b/src/components/Project/Infrastructure/BuildingModel.jsx
index 7db3c2dc..374c7719 100644
--- a/src/components/Project/Infrastructure/BuildingModel.jsx
+++ b/src/components/Project/Infrastructure/BuildingModel.jsx
@@ -6,6 +6,7 @@ import ProjectRepository from "../../../repositories/ProjectRepository";
 import { useSelector } from "react-redux";
 import { useProjectDetails } from "../../../hooks/useProjects";
 import {getCachedData} from "../../../slices/apiDataManager";
+import showToast from "../../../services/toastService";
 
 // Zod validation schema
 const buildingSchema = z.object({
@@ -79,10 +80,18 @@ const BuildingModel = ({
 
   const onSubmitHandler = async (data) => {
     onSubmit({ ...data, projectId: project.id });
-    reset({
-      name: null,
-      description: null,
-    });
+    reset( {
+      Id:"0",
+      name: "",
+      description: "",
+    } );
+    if ( data.Id !== "0" )
+      {
+        showToast( "Building updated successfully.", "success" );
+      } else
+      {
+        showToast( "Building created successfully.", "success" );
+       }
   };
 
   useEffect( () =>
diff --git a/src/components/Project/Infrastructure/FloorModel.jsx b/src/components/Project/Infrastructure/FloorModel.jsx
index 42e10123..2d64c275 100644
--- a/src/components/Project/Infrastructure/FloorModel.jsx
+++ b/src/components/Project/Infrastructure/FloorModel.jsx
@@ -2,7 +2,8 @@ import React, { useState, useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { zodResolver } from "@hookform/resolvers/zod";
-import {getCachedData} from "../../../slices/apiDataManager";
+import { getCachedData } from "../../../slices/apiDataManager";
+import showToast from "../../../services/toastService";
 
 // Zod validation schema
 const floorSchema = z.object({
@@ -24,13 +25,11 @@ const FloorModel = ({
   onSubmit,
   clearTrigger,
   onClearComplete,
-} ) =>
-{
-
+}) => {
   const [formData, setFormData] = useState(defaultModel);
-  const [ selectedBuilding, setSelectedBuilding ] = useState( {} );
+  const [selectedBuilding, setSelectedBuilding] = useState({});
   const [buildings, setBuildings] = useState(project?.buildings || []);
-  
+
   // Initialize the form with React Hook Form
   const {
     register,
@@ -44,14 +43,12 @@ const FloorModel = ({
     defaultValues: defaultModel,
   });
 
-  useEffect( () =>
-  {
-
+  useEffect(() => {
     if (clearTrigger) {
       reset(defaultModel);
       onClearComplete();
     }
-  }, [clearTrigger, onClearComplete, reset,]);
+  }, [clearTrigger, onClearComplete, reset]);
 
   // Handle building selection change
   const handleBuildigChange = (e) => {
@@ -63,7 +60,6 @@ const FloorModel = ({
         id: "",
         floorName: "",
         buildingId: building.id,
- 
       });
       setValue("buildingId", building.id); // Set value for validation
       setValue("id", "0"); // Reset floorId when changing building
@@ -73,13 +69,10 @@ const FloorModel = ({
         id: "",
         floorName: "",
         buildingId: "0",
-
       });
       setValue("buildingId", "0");
     }
   };
- 
-
 
   // Handle floor selection change
   const handleFloorChange = (e) => {
@@ -90,15 +83,13 @@ const FloorModel = ({
         id: floor.id,
         floorName: floor.floorName,
         buildingId: selectedBuilding.id,
-      
       });
-      setValue("floorName", floor.floorName); // Set floor name for form
+      setValue("floorName", floor.floorName);
     } else {
       setFormData({
         id: "0",
         floorName: "",
         buildingId: selectedBuilding.id,
-    
       });
       setValue("floorName", "");
     }
@@ -107,23 +98,31 @@ const FloorModel = ({
   // Handle form submission
   const onFormSubmit = (data) => {
     onSubmit(data);
+    reset({
+      floorName: "",
+    });
+    if (data.id !== "0") {
+      showToast("Floor updated successfully.", "success");
+    } else {
+      showToast("Floor created successfully.", "success");
+    }
   };
 
-
-  
   return (
     <div className="modal-dialog modal-lg modal-simple modal-edit-user">
       <div className="modal-content">
         <div className="modal-body">
           <div className="row">
-            <button type="button" className="btn-close" aria-label="Close" onClick={onClose}/>
+            <button
+              type="button"
+              className="btn-close"
+              aria-label="Close"
+              onClick={onClose}
+            />
             <div className="text-center mb-1">
               <h5 className="mb-1">Manage Floors - {project.name}</h5>
             </div>
-            <form
-              className="row g-2"
-              onSubmit={handleSubmit(onFormSubmit)}
-            >
+            <form className="row g-2" onSubmit={handleSubmit(onFormSubmit)}>
               <div className="col-12 col-md-12">
                 <label className="form-label" htmlFor="buildingId">
                   Select Building
@@ -137,12 +136,15 @@ const FloorModel = ({
                 >
                   <option value="0">Select Building</option>
                   {buildings &&
-                  buildings?.length > 0 &&
-                  buildings.map((building) => (
-                    <option key={building.id} value={building.id}>
-                      {building.name}
-                    </option>
-                  ))}
+                    buildings?.length > 0 &&
+                    buildings
+                      ?.slice()
+                      ?.sort((a, b) => a.name.localeCompare(b.name))
+                      ?.map((building) => (
+                        <option key={building.id} value={building.id}>
+                          {building.name}
+                        </option>
+                      ))}
                 </select>
                 {errors.buildingId && (
                   <p className="text-danger">{errors.buildingId.message}</p>
@@ -151,9 +153,7 @@ const FloorModel = ({
 
               {formData.buildingId !== "0" && (
                 <div className="col-12 col-md-12">
-                  <label className="form-label" >
-                    Select Floor
-                  </label>
+                  <label className="form-label">Select Floor</label>
                   <select
                     id="id"
                     className="select2 form-select form-select-sm"
@@ -167,14 +167,16 @@ const FloorModel = ({
                         {floor.floorName}
                       </option>
                     ) )} */}
-                    
+
                     {selectedBuilding &&
-                  selectedBuilding?.floors.length > 0 &&
-                  selectedBuilding?.floors.map((floor) => (
-                    <option key={floor.id} value={floor.id}>
-                      {floor.floorName}
-                    </option>
-                  ))}
+                      selectedBuilding.floors.length > 0 &&
+                      [...selectedBuilding.floors]
+                        ?.sort((a, b) => a.floorName.localeCompare(b.floorName))
+                        ?.map((floor) => (
+                          <option key={floor.id} value={floor.id}>
+                            {floor.floorName}
+                          </option>
+                        ))}
                   </select>
                   {errors.id && (
                     <p className="text-danger">{errors.id.message}</p>
diff --git a/src/components/Project/Infrastructure/TaskModel.jsx b/src/components/Project/Infrastructure/TaskModel.jsx
index 791b99ee..ee3c1ff1 100644
--- a/src/components/Project/Infrastructure/TaskModel.jsx
+++ b/src/components/Project/Infrastructure/TaskModel.jsx
@@ -1,12 +1,11 @@
 import React, { useState, useEffect } from "react";
 import { useForm } from "react-hook-form";
-import { zodResolver } from '@hookform/resolvers/zod';
+import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
-import {useDispatch} from "react-redux";
-import {changeMaster} from "../../../slices/localVariablesSlice";
+import { useDispatch } from "react-redux";
+import { changeMaster } from "../../../slices/localVariablesSlice";
 import useMaster from "../../../hooks/masterHook/useMaster";
 
-// Define Zod validation schema
 const taskSchema = z.object({
   buildingID: z.string().min(1, "Building is required"),
   floorId: z.string().min(1, "Floor is required"),
@@ -18,6 +17,8 @@ const taskSchema = z.object({
 
 const defaultModel = {
   id: "0",
+  buildingID: "0",
+  floorId: "0",
   workAreaId: 0,
   activityID: 0,
   plannedWork: 0,
@@ -28,59 +29,39 @@ const TaskModel = ({
   project,
   onSubmit,
   clearTrigger,
-  onClearComplete,onClose
-} )=>{
-  const dispatch = useDispatch()
-  const {data:activities,loading} = useMaster()
+  onClearComplete,
+  onClose,
+}) => {
+  const dispatch = useDispatch();
+  const { data: activities } = useMaster();
   const [formData, setFormData] = useState(defaultModel);
   const [selectedBuilding, setSelectedBuilding] = useState(null);
   const [selectedFloor, setSelectedFloor] = useState(null);
   const [selectedWorkArea, setSelectedWorkArea] = useState(null);
   const [selectedActivity, setSelectedActivity] = useState(null);
+  const [isSubmitting, setIsSubmitting] = useState(false);
 
-  
-  const { register, handleSubmit, formState: { errors },reset } = useForm({
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+    reset,
+  } = useForm({
     resolver: zodResolver(taskSchema),
-    defaultValues: formData,
+    defaultValues: defaultModel,
   });
 
   useEffect(() => {
     if (clearTrigger) {
-      setFormData(defaultModel);
+      resetForm();
       onClearComplete();
     }
   }, [clearTrigger, onClearComplete]);
 
-  // Handle input changes
-  const handleChange = (e) => {
-    const { name, value } = e.target;
-    const activity = activities.find((b) => b.id === Number(value));
-    setFormData({ ...formData, [name]: value });
-  };
-
-  const handleActivityChange = (e) => {
-    const { value } = e.target;
-    const activity = activities.find((b) => b.id === Number(value));
-
-    setFormData({ ...formData, ["activityID"]: value });
-    setSelectedActivity(activity);
-  };
-
-  const handleWorkAreaChange = (e) => {
-    const { value } = e.target;
-    const workArea = selectedFloor.workAreas.find((b) => b.id === Number(value));
-    setSelectedWorkArea(workArea);
-    setFormData({ ...formData, ["workAreaId"]: value });
-  };
-
-  const handleFloorChange = (e) => {
-    const { value } = e.target;
-    const floor = selectedBuilding.floors.find((b) => b.id === Number(value));
-    setSelectedFloor(floor);
-    setSelectedWorkArea(null);
-    setSelectedActivity(null);
-    setFormData(defaultModel);
-  };
+  useEffect(() => {
+    dispatch(changeMaster("Activity"));
+    resetForm();
+  }, []);
 
   const handleBuildingChange = (e) => {
     const { value } = e.target;
@@ -89,95 +70,138 @@ const TaskModel = ({
     setSelectedFloor(null);
     setSelectedWorkArea(null);
     setSelectedActivity(null);
+    reset({
+      ...defaultModel,
+      buildingID: value,
+    });
+  };
+
+  const handleFloorChange = (e) => {
+    const { value } = e.target;
+    const floor = selectedBuilding.floors.find((b) => b.id === Number(value));
+    setSelectedFloor(floor);
+    setSelectedWorkArea(null);
+    setSelectedActivity(null);
+    reset((prev) => ({
+      ...prev,
+      floorId: value,
+      workAreaId: 0,
+      activityID: 0,
+    }));
+  };
+
+  const handleWorkAreaChange = (e) => {
+    const { value } = e.target;
+    const workArea = selectedFloor.workAreas.find(
+      (b) => b.id === Number(value)
+    );
+    setSelectedWorkArea(workArea);
+    reset((prev) => ({
+      ...prev,
+      workAreaId: Number(value),
+    }));
+  };
+
+  const handleActivityChange = (e) => {
+    const { value } = e.target;
+    const activity = activities.find((b) => b.id === Number(value));
+    setSelectedActivity(activity);
+    reset((prev) => ({
+      ...prev,
+      activityID: Number(value),
+    }));
+  };
+
+  const onSubmitForm = async (data) => {
+    setIsSubmitting(true);
+    await onSubmit(data);
+    reset({
+      buildingID: data.buildingID,
+      floorId: data.floorId,
+      workAreaId: data.workAreaId,
+      activityID: data.activityID,
+      plannedWork: 0,
+      completedWork: 0,
+    });
+    setIsSubmitting(false);
+  };
+
+  const resetForm = () => {
     setFormData(defaultModel);
+    setSelectedBuilding(null);
+    setSelectedFloor(null);
+    setSelectedWorkArea(null);
+    setSelectedActivity(null);
+    reset(defaultModel);
   };
 
-  const onSubmitForm = ( data ) =>
-  {
-    onSubmit( data ); 
-    setSelectedActivity(null),
-   setSelectedWorkArea(null)
-    reset( {
-      plannedWork: 0,
-      completedWork:0
-      
-    })
-  };
-
-  useEffect( () =>
-  {
-
-    dispatch(changeMaster("Activity")),
-    () =>{
-      resetVlaue ()
-    }
-  },[])
-  const resetVlaue = () =>
-  {
-    setSelectedBuilding( null )
-    setSelectedFloor( null )
-    setSelectedWorkArea( null )
-    setSelectedActivity(null)
-    reset( {
-      plannedWork: 0,
-      completedWork:0
-    })
- }
   return (
     <div className="modal-dialog modal-lg modal-simple modal-edit-user">
       <div className="modal-content">
         <div className="modal-body">
           <div className="row">
-          <button type="button" className="btn-close" aria-label="Close" onClick={onClose}/>
+            <button
+              type="button"
+              className="btn-close"
+              aria-label="Close"
+              onClick={onClose}
+            />
             <div className="text-center mb-1">
               <h5 className="mb-1">Manage Task</h5>
             </div>
             <form className="row g-2" onSubmit={handleSubmit(onSubmitForm)}>
               {/* Select Building */}
               <div className="col-6 col-md-6">
-                <label className="form-label" htmlFor="name">
+                <label className="form-label" htmlFor="buildingID">
                   Select Building
                 </label>
                 <select
                   id="buildingID"
-                  name="buildingID"
-                  className="select2 form-select form-select-sm"
-                  aria-label="Default select example"
+                  className="form-select form-select-sm"
                   {...register("buildingID")}
-                  onChange={(e) => handleBuildingChange(e)}
+                  onChange={handleBuildingChange}
                 >
                   <option value="0">Select Building</option>
-                  {project.buildings.map((building) => (
-                    <option key={building.id} value={building.id}>
-                      {building.name}
-                    </option>
-                  ))}
+                  {project.buildings
+                    ?.slice()
+                    ?.sort((a, b) => a.name.localeCompare(b.name))
+                    ?.map((building) => (
+                      <option key={building.id} value={building.id}>
+                        {building.name}
+                      </option>
+                    ))}
                 </select>
-                {errors.buildingID && <p className="danger-text">{errors.buildingID.message}</p>}
+                {errors.buildingID && (
+                  <p className="danger-text">{errors.buildingID.message}</p>
+                )}
               </div>
 
               {/* Select Floor */}
-              {selectedBuilding && selectedBuilding.id !== "0" && (
+              {selectedBuilding && (
                 <div className="col-6 col-md-6">
                   <label className="form-label" htmlFor="floorId">
                     Select Floor
                   </label>
                   <select
                     id="floorId"
-                    name="floorId"
-                    className="select2 form-select form-select-sm"
-                    aria-label="Default select example"
+                    className="form-select form-select-sm"
                     {...register("floorId")}
-                    onChange={(e) => handleFloorChange(e)}
+                    onChange={handleFloorChange}
                   >
                     <option value="0">Select Floor</option>
-                    {selectedBuilding.floors.map((floor) => (
-                      <option key={floor.id} value={floor.id}>
-                        {floor.floorName} - ({floor.workAreas.length} Work Areas)
-                      </option>
-                    ))}
+                    {selectedBuilding.floors
+                      ?.slice()
+                      ?.sort((a, b) => a.floorName.localeCompare(b.floorName))
+                      ?.map((floor) => (
+                        <option key={floor.id} value={floor.id}>
+                          {floor.floorName} - ({floor.workAreas.length} Work
+                          Areas)
+                        </option>
+                      ))}
                   </select>
-                  {errors.floorId && <p  className="danger-text">{errors.floorId.message}</p>}
+                  {errors.floorId && (
+                    <p className="danger-text">{errors.floorId.message}</p>
+                  )}
                 </div>
               )}
 
@@ -189,20 +213,23 @@ const TaskModel = ({
                   </label>
                   <select
                     id="workAreaId"
-                    name="workAreaId"
-                    className="select2 form-select form-select-sm"
-                    aria-label="Default select example"
-                    {...register("workAreaId",{valueAsNumber:true})}
-                    onChange={(e) => handleWorkAreaChange(e)}
+                    className="form-select form-select-sm"
+                    {...register("workAreaId", { valueAsNumber: true })}
+                    onChange={handleWorkAreaChange}
                   >
                     <option value="0">Select Work Area</option>
-                    {selectedFloor.workAreas.map((workArea) => (
-                      <option key={workArea.id} value={workArea.id}>
-                        {workArea.areaName}
-                      </option>
-                    ))}
+                    {selectedFloor.workAreas
+                      ?.slice() 
+                      ?.sort((a, b) => a.areaName.localeCompare(b.areaName)) 
+                      ?.map((workArea) => (
+                        <option key={workArea.id} value={workArea.id}>
+                          {workArea.areaName}
+                        </option>
+                      ))}
                   </select>
-                  {errors.workAreaId && <p  className="danger-text">{errors.workAreaId.message}</p>}
+                  {errors.workAreaId && (
+                    <p className="danger-text">{errors.workAreaId.message}</p>
+                  )}
                 </div>
               )}
 
@@ -214,20 +241,25 @@ const TaskModel = ({
                   </label>
                   <select
                     id="activityID"
-                    name="activityID"
-                    className="select2 form-select form-select-sm"
-                    aria-label="Default select example"
-                    {...register("activityID",{valueAsNumber:true})}
-                    onChange={(e) => handleActivityChange(e)}
+                    className="form-select form-select-sm"
+                    {...register("activityID", { valueAsNumber: true })}
+                    onChange={handleActivityChange}
                   >
                     <option value="0">Select Activity</option>
-                    {activities.map((activity) => (
-                      <option key={activity.id} value={activity.id}>
-                        {activity.activityName}
-                      </option>
-                    ))}
+                    {activities
+                      ?.slice()
+                      ?.sort((a, b) =>
+                        a.activityName.localeCompare(b.activityName)
+                      )
+                      ?.map((activity) => (
+                        <option key={activity.id} value={activity.id}>
+                          {activity.activityName}
+                        </option>
+                      ))}
                   </select>
-                  {errors.activityID && <p className="danger-text">{errors.activityID.message}</p>}
+                  {errors.activityID && (
+                    <p className="danger-text">{errors.activityID.message}</p>
+                  )}
                 </div>
               )}
 
@@ -240,12 +272,12 @@ const TaskModel = ({
                   <input
                     {...register("plannedWork", { valueAsNumber: true })}
                     type="number"
-                    id="plannedWork"
-                    name="plannedWork"
                     className="form-control form-control-sm me-2"
                     placeholder="Planned Work"
                   />
-                  {errors.plannedWork && <p className="danger-text">{errors.plannedWork.message}</p>}
+                  {errors.plannedWork && (
+                    <p className="danger-text">{errors.plannedWork.message}</p>
+                  )}
                 </div>
               )}
 
@@ -258,12 +290,14 @@ const TaskModel = ({
                   <input
                     {...register("completedWork", { valueAsNumber: true })}
                     type="number"
-                    id="completedWork"
-                    name="completedWork"
                     className="form-control form-control-sm me-2"
                     placeholder="Completed Work"
                   />
-                  {errors.completedWork && <p className="danger-text">{errors.completedWork.message}</p>}
+                  {errors.completedWork && (
+                    <p className="danger-text">
+                      {errors.completedWork.message}
+                    </p>
+                  )}
                 </div>
               )}
 
@@ -276,8 +310,6 @@ const TaskModel = ({
                   <input
                     type="text"
                     disabled
-                    id="unit"
-                    name="unit"
                     className="form-control form-control-sm me-2"
                     value={selectedActivity?.unitOfMeasurement || ""}
                   />
@@ -286,7 +318,11 @@ const TaskModel = ({
 
               <div className="col-12 text-center">
                 <button type="submit" className="btn btn-sm btn-primary me-3">
-                  {formData.id !== "0" && formData.id !== "" ? "Edit Task" : "Add Task"}
+                  {isSubmitting
+                    ? "Please Wait.."
+                    : formData.id !== "0" && formData.id !== ""
+                    ? "Edit Task"
+                    : "Add Task"}
                 </button>
                 <button
                   type="button"
@@ -295,7 +331,6 @@ const TaskModel = ({
                 >
                   Cancel
                 </button>
-               
               </div>
             </form>
           </div>
diff --git a/src/components/Project/Infrastructure/WorkAreaModel.jsx b/src/components/Project/Infrastructure/WorkAreaModel.jsx
index 951575b8..f6beaddd 100644
--- a/src/components/Project/Infrastructure/WorkAreaModel.jsx
+++ b/src/components/Project/Infrastructure/WorkAreaModel.jsx
@@ -2,14 +2,18 @@ import React, { useState, useEffect } from "react";
 import { set, useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
+import showToast from "../../../services/toastService";
 
 // Zod schema for form validation
-const workAreaSchema = z.object( {
-  id:z.string().nonempty("Floor is required"),
-  
+const workAreaSchema = z.object({
+  id: z.string().nonempty("Floor is required"),
+
   buildingId: z.string().nonempty("Building is required"),
   floorId: z.string().nonempty("Floor is required"),
-  areaName: z.string().nonempty( "Work Area Name is required" ).min( 3, "Name must be at least 3 characters long" ),
+  areaName: z
+    .string()
+    .nonempty("Work Area Name is required")
+    .min(3, "Name must be at least 3 characters long"),
 });
 
 // Default form data
@@ -19,17 +23,30 @@ const defaultModel = {
   floorId: "0",
 };
 
-const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClose }) => {
+const WorkAreaModel = ({
+  project,
+  onSubmit,
+  clearTrigger,
+  onClearComplete,
+  onClose,
+}) => {
   const [selectedBuilding, setSelectedBuilding] = useState(null);
-  const [ selectedFloor, setSelectedFloor ] = useState( null );
-  const [selectdWorkArea,setWorkArea] = useState()
+  const [selectedFloor, setSelectedFloor] = useState(null);
+  const [selectdWorkArea, setWorkArea] = useState();
 
-  const { register, handleSubmit, formState: { errors }, setValue, reset, watch } = useForm({
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+    setValue,
+    reset,
+    watch,
+  } = useForm({
     resolver: zodResolver(workAreaSchema), // Use Zod resolver for validation
     defaultValues: defaultModel,
   });
 
-  const floorId = watch( "floorId" );  // Watch the floorId for conditional rendering
+  const floorId = watch("floorId"); // Watch the floorId for conditional rendering
 
   useEffect(() => {
     if (clearTrigger) {
@@ -40,25 +57,22 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClo
     }
   }, [clearTrigger, onClearComplete, reset]);
 
-  const handleWorkAreaChange = ( e ) =>
-  {
-    
-    
+  const handleWorkAreaChange = (e) => {
     const { value } = e.target;
 
     if (value === "0") {
-      setValue("id", "0");  // Create New Work Area
-      setValue( "areaName", "" );
- 
-      setWorkArea(String(0))
-    } else {
-      const workArea = selectedFloor?.workAreas.find((b) => b.id === Number(value));
-      if ( workArea )
-      {
-        setValue("id", String(workArea.id));  // Set id as a string
-        setValue("areaName", workArea.areaName);
-        setWorkArea(String(workArea.id))
+      setValue("id", "0"); // Create New Work Area
+      setValue("areaName", "");
 
+      setWorkArea(String(0));
+    } else {
+      const workArea = selectedFloor?.workAreas.find(
+        (b) => b.id === Number(value)
+      );
+      if (workArea) {
+        setValue("id", String(workArea.id)); // Set id as a string
+        setValue("areaName", workArea.areaName);
+        setWorkArea(String(workArea.id));
       }
     }
   };
@@ -69,8 +83,8 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClo
 
     if (floor) {
       setSelectedFloor(floor);
-      setValue("floorId", floor.id);  // Update floorId
-      setValue("id", "0");  // Reset Work Area ID for new area creation
+      setValue("floorId", floor.id); // Update floorId
+      setValue("id", "0"); // Reset Work Area ID for new area creation
       setValue("areaName", ""); // Reset Work Area Name when changing floor
     } else {
       setSelectedFloor(null);
@@ -88,23 +102,31 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClo
     reset(defaultModel); // Reset the form when a new building is selected
   };
 
-  const onSubmitForm = ( data ) =>
-  {
-
+  const onSubmitForm = (data) => {
     let WorkArea = {
       id: data.id,
       areaName: data.areaName,
       floorId: data.floorId,
-      buildingId:data.buildingId
+      buildingId: data.buildingId,
+    };
+    onSubmit(WorkArea);
+
+    reset({
+      id: "0",
+      areaName: "",
+    });
+    if (data.id !== "0") {
+      showToast("WorkArea updated successfully.", "success");
+    } else {
+      showToast("WorkArea created successfully.", "success");
     }
-    onSubmit(WorkArea);  // Send the final data to the parent
   };
 
   const handleCancel = () => {
-    reset(defaultModel); // Reset the form to initial state
+    reset(defaultModel);
     setSelectedFloor(null);
-    setSelectedBuilding( null );
-    onClose()
+    setSelectedBuilding(null);
+    onClose();
   };
 
   return (
@@ -112,14 +134,21 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClo
       <div className="modal-content">
         <div className="modal-body">
           <div className="row">
-          <button type="button" className="btn-close" aria-label="Close" onClick={onClose}/>
+            <button
+              type="button"
+              className="btn-close"
+              aria-label="Close"
+              onClick={onClose}
+            />
             <div className="text-center mb-1">
               <h5 className="mb-1">Manage Work Area</h5>
             </div>
             <form className="row g-2" onSubmit={handleSubmit(onSubmitForm)}>
               {/* Building Selection */}
               <div className="col-6 col-md-6">
-                <label className="form-label" htmlFor="buildingId">Select Building</label>
+                <label className="form-label" htmlFor="buildingId">
+                  Select Building
+                </label>
                 <select
                   id="buildingId"
                   name="buildingId"
@@ -128,11 +157,14 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClo
                   onChange={handleBuildingChange}
                 >
                   <option value="0">Select Building</option>
-                  {project?.buildings?.map((building) => (
-                    <option key={building.id} value={building.id}>
-                      {building.name}
-                    </option>
-                  ))}
+                  {project?.buildings
+                    ?.slice()
+                    .sort((a, b) => a.name.localeCompare(b.name))
+                    .map((building) => (
+                      <option key={building.id} value={building.id}>
+                        {building.name}
+                      </option>
+                    ))}
                 </select>
                 {errors.buildingId && <span>{errors.buildingId.message}</span>}
               </div>
@@ -140,7 +172,9 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClo
               {/* Floor Selection */}
               {selectedBuilding && selectedBuilding.buildingId !== "0" && (
                 <div className="col-6 col-md-6">
-                  <label className="form-label" htmlFor="floorId">Select Floor</label>
+                  <label className="form-label" htmlFor="floorId">
+                    Select Floor
+                  </label>
                   <select
                     id="floorId"
                     name="floorId"
@@ -149,11 +183,14 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClo
                     onChange={handleFloorChange}
                   >
                     <option value="0">Select Floor</option>
-                    {selectedBuilding.floors.map((floor) => (
-                      <option key={floor.id} value={floor.id}>
-                        {floor.floorName}
-                      </option>
-                    ))}
+                    {selectedBuilding.floors
+                      ?.slice() 
+                      .sort((a, b) => a.floorName.localeCompare(b.floorName)) 
+                      .map((floor) => (
+                        <option key={floor.id} value={floor.id}>
+                          {floor.floorName}
+                        </option>
+                      ))}
                   </select>
                   {errors.floorId && <span>{errors.floorId.message}</span>}
                 </div>
@@ -163,7 +200,7 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClo
               {floorId !== "0" && (
                 <>
                   <div className="col-12 col-md-12">
-                    <label className="form-label" >Select Work Area</label>
+                    <label className="form-label">Select Work Area</label>
                     <select
                       id="workAreaId"
                       name="workAreaId"
@@ -184,7 +221,9 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClo
                   {/* Work Area Name Input */}
                   <div className="col-12 col-md-12">
                     <label className="form-label" htmlFor="areaName">
-                      {watch("id") === "0" ? "Enter Work Area Name" : "Modify Work Area Name"}
+                      {watch("id") === "0"
+                        ? "Enter Work Area Name"
+                        : "Modify Work Area Name"}
                     </label>
                     <input
                       type="text"
@@ -194,15 +233,28 @@ const WorkAreaModel = ({ project, onSubmit, clearTrigger, onClearComplete, onClo
                       placeholder="Work Area"
                       {...register("areaName")}
                     />
-                    {errors.areaName && <span className="danger-text">{errors.areaName.message}</span>}
+                    {errors.areaName && (
+                      <span className="danger-text">
+                        {errors.areaName.message}
+                      </span>
+                    )}
                   </div>
 
                   {/* Submit and Cancel Buttons */}
                   <div className="col-12 text-center">
-                    <button type="submit" className="btn btn-sm btn-primary me-3">
+                    <button
+                      type="submit"
+                      className="btn btn-sm btn-primary me-3"
+                    >
                       {watch("id") === "0" ? "Add Work Area" : "Edit Work Area"}
                     </button>
-                    <button type="button" className="btn btn-sm btn-label-secondary" onClick={handleCancel} data-bs-dismiss="modal" aria-label="Close">
+                    <button
+                      type="button"
+                      className="btn btn-sm btn-label-secondary"
+                      onClick={handleCancel}
+                      data-bs-dismiss="modal"
+                      aria-label="Close"
+                    >
                       Cancel
                     </button>
                   </div>
diff --git a/src/components/Project/Infrastructure/WorkItem.jsx b/src/components/Project/Infrastructure/WorkItem.jsx
index ab85c28d..d568c14c 100644
--- a/src/components/Project/Infrastructure/WorkItem.jsx
+++ b/src/components/Project/Infrastructure/WorkItem.jsx
@@ -8,6 +8,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
   const [itemName, setItemName] = useState("");
   const [NewWorkItem, setNewWorkItem] = useState();
   const [isModalOpen, setIsModalOpen] = useState(false);
+  const [showModal, setShowModal] = useState(false);
 
   const openModal = () => setIsModalOpen(true);
   const closeModal = () => setIsModalOpen(false);
@@ -38,6 +39,8 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
     tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el));
   }, []);
 
+  const showModal1 = () => setShowModal(true);
+  const closeModal1 = () => setShowModal(false);
   return (
     <>
       <div
@@ -50,6 +53,33 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
         <AssignRoleModel assignData={assigndata} onClose={closeModal} />
       </div>
 
+      <div
+        className={`modal fade ${showModal ? "show" : ""}`}
+        tabIndex="-1"
+        role="dialog"
+        style={{ display: showModal ? "block" : "none" }}
+        aria-hidden={!showModal}
+      >
+        <div
+          className="modal-dialog modal-lg modal-simple mx-sm-auto mx-1 edit-project-modal"
+          role="document"
+        >
+          <div className="modal-content">
+            <div className="modal-body p-sm-4 p-0">
+              <button
+                type="button"
+                className="btn-close"
+                onClick={closeModal1}
+                aria-label="Close"
+              ></button>
+              <div className="container my-1"></div>
+
+              <h6>Comming Soon</h6>
+            </div>
+          </div>
+        </div>
+      </div>
+
       <tr>
         <td className="text-start table-cell-small">
           <i className="bx bx-right-arrow-alt"></i>
@@ -119,6 +149,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
               aria-label="Modify"
               type="button"
               className="btn p-0 dropdown-toggle hide-arrow"
+              onClick={showModal1}
             >
               <i
                 className="bx bxs-edit me-2 text-primary"
@@ -132,6 +163,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
               aria-label="Delete"
               type="button"
               className="btn p-0 dropdown-toggle hide-arrow"
+              onClick={showModal1}
             >
               <i
                 className="bx bx-trash me-1 text-danger"
@@ -154,11 +186,11 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
 
             <div className="dropdown-menu dropdown-menu-end m-0">
               {" "}
-              <a className="dropdown-item ">
+              <a className="dropdown-item " onClick={showModal1}>
                 {" "}
                 <i className="bx bxs-edit me-2 text-primary"></i>Edit
               </a>
-              <a className="dropdown-item">
+              <a className="dropdown-item" onClick={showModal1}>
                 {" "}
                 <i className="bx bx-trash me-1 text-danger"></i>Delete
               </a>
diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx
index 0c8eadac..eaee8972 100644
--- a/src/components/Project/ProjectInfra.jsx
+++ b/src/components/Project/ProjectInfra.jsx
@@ -160,7 +160,7 @@ const ProjectInfra = ({
           });
      
           setProject( updatedProject );
-          closeTaskModel()
+          // closeTaskModel()
         }
       })
       .catch((error) => {
@@ -172,7 +172,6 @@ const ProjectInfra = ({
   const submitData = async (infraObject) => {
     try
     {
-      debugger
       
       let response = await ProjectRepository.manageProjectInfra(infraObject);
       const entity = response.data;
@@ -206,7 +205,8 @@ const ProjectInfra = ({
           ...prevProject,
           buildings: updatedBuildings,
         } ) );
-        closeBuildingModel()
+        // closeBuildingModel()
+        
       }
       // Handle the floor data
       else if (entity.floor) {
@@ -243,7 +243,7 @@ const ProjectInfra = ({
           data: updatedProject,
         });
         setProject( updatedProject );
-        closeFloorModel()
+        // closeFloorModel()
       }
       // Handle the work area data
       else if ( entity.workArea )
@@ -287,7 +287,7 @@ const ProjectInfra = ({
           data: updatedProject,
         });
         setProject( updatedProject );
-        closeWorkAreaModel()
+        // closeWorkAreaModel()
       }
       // Handle the task (workItem) data
       else {
@@ -296,7 +296,6 @@ const ProjectInfra = ({
     } catch (Err) {
       showToast("Somthing wrong", "error");
     }
-    handleClose();
   };