diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx
index 68b73943..b765dc82 100644
--- a/src/components/Activities/AttendcesLogs.jsx
+++ b/src/components/Activities/AttendcesLogs.jsx
@@ -50,7 +50,7 @@ const AttendanceLog = ({ attendance, handleModalData, projectId }) => {
           <table className="table mb-0">
             <thead>
               <tr>
-                <th className="border-top-0" colSpan={2}>Name</th>
+                <th className="border-top-1" colSpan={2}>Name</th>
                 <th>
                   <i className="bx bxs-down-arrow-alt text-success"></i> Check-In
                 </th>
diff --git a/src/components/Project/AssignRole.jsx b/src/components/Project/AssignRole.jsx
index 336677c9..dd3ab32e 100644
--- a/src/components/Project/AssignRole.jsx
+++ b/src/components/Project/AssignRole.jsx
@@ -35,7 +35,7 @@ const [selectedRole, setSelectedRole] = useState("all");
 const [selectedEmployees, setSelectedEmployees] = useState([]);
 
 
-const { handleSubmit, control, setValue, watch, formState: { errors } } = useForm({
+const { handleSubmit, control, setValue, watch, formState: { errors },reset } = useForm({
   defaultValues: {
     selectedEmployees: [],
     description:""
@@ -93,9 +93,10 @@ const onSubmit = async(data) => {
   };
   try
   {
-    let response = await TasksRepository.assignTask( formattedData );
-    console.log( response )
+    // let response = await TasksRepository.assignTask( formattedData );
+    // console.log( response )
     showToast( "Task Successfully Assigend", "success" )
+    reset()
     closeModal()
   } catch ( error )
   {
diff --git a/src/components/Project/Infrastructure/Building.jsx b/src/components/Project/Infrastructure/Building.jsx
index 30d5eacf..4f059964 100644
--- a/src/components/Project/Infrastructure/Building.jsx
+++ b/src/components/Project/Infrastructure/Building.jsx
@@ -12,14 +12,14 @@ const Building = ( {building, toggleBuilding, expandedBuildings, getContent} ) =
             onClick={() => toggleBuilding(building.id)}
           >
             <div className="row table-responsive">
-              <h5 style={{ marginBottom: "0px" }}>
+              <h6 style={{ marginBottom: "0px", fontSize:"14px" }}>
                 {building.name} &nbsp;
                 {expandedBuildings.includes(building.id) ? (
                   <i className="bx bx-chevron-down"></i>
                 ) : (
                   <i className="bx bx-chevron-right"></i>
                 )}
-              </h5>
+              </h6>
             </div>
           </td>
         </tr>
diff --git a/src/components/Project/Infrastructure/BuildingModel.jsx b/src/components/Project/Infrastructure/BuildingModel.jsx
index f7169b2f..89216ea7 100644
--- a/src/components/Project/Infrastructure/BuildingModel.jsx
+++ b/src/components/Project/Infrastructure/BuildingModel.jsx
@@ -124,10 +124,10 @@ const BuildingModel = ({
             </div>
 
             <div className="col-12 text-center">
-              <button type="submit" className="btn btn-primary me-3">
+              <button type="submit" className="btn btn-sm btn-primary me-3">
                 {   (  formData.id &&  getValues("name"))  ? "Edit Building" : "Add Building"}
               </button>
-              <button type="reset" className="btn btn-label-secondary" data-bs-dismiss="modal" aria-label="Close" onClick={onClose}>
+              <button type="reset" className="btn btn-sm btn-label-secondary" data-bs-dismiss="modal" aria-label="Close" onClick={onClose}>
                 Cancel
               </button>
             </div>
diff --git a/src/components/Project/Infrastructure/FloorModel.jsx b/src/components/Project/Infrastructure/FloorModel.jsx
index e2c5f6ac..cc78d4b4 100644
--- a/src/components/Project/Infrastructure/FloorModel.jsx
+++ b/src/components/Project/Infrastructure/FloorModel.jsx
@@ -97,7 +97,6 @@ const FloorModel = ({
 
   // Handle form submission
   const onFormSubmit = (data) => {
-
     onSubmit(data);
   };
 
@@ -186,14 +185,14 @@ const FloorModel = ({
               )}
 
               <div className="col-12 text-center">
-                <button type="submit" className="btn btn-primary me-3">
+                <button type="submit" className="btn btn-sm btn-primary me-3">
                   {formData.id !== "0" && formData.id !== ""
                     ? "Edit Floor"
                     : "Add Floor"}
                 </button>
                 <button
                   type="reset"
-                  className="btn btn-label-secondary"
+                  className="btn btn-sm btn-label-secondary"
                   data-bs-dismiss="modal"
                   aria-label="Close"
                 >
diff --git a/src/components/Project/Infrastructure/TaskModel.jsx b/src/components/Project/Infrastructure/TaskModel.jsx
index c63e4fe5..316c5d15 100644
--- a/src/components/Project/Infrastructure/TaskModel.jsx
+++ b/src/components/Project/Infrastructure/TaskModel.jsx
@@ -94,7 +94,7 @@ const TaskModel = ({
     
     onSubmit( data ); 
     setSelectedActivity(null),
-   selectedWorkArea(null)
+   setSelectedWorkArea(null)
     reset( {
       plannedWork: 0,
       completedWork:0
@@ -286,12 +286,12 @@ const TaskModel = ({
               )}
 
               <div className="col-12 text-center">
-                <button type="submit" className="btn btn-primary me-3">
+                <button type="submit" className="btn btn-sm btn-primary me-3">
                   {formData.id !== "0" && formData.id !== "" ? "Edit Task" : "Add Task"}
                 </button>
                 <button
                   type="reset"
-                  className="btn btn-label-secondary"
+                  className="btn btn-sm btn-label-secondary"
                   data-bs-dismiss="modal"
                   aria-label="Close"
                 >
diff --git a/src/components/Project/Infrastructure/WorkArea.jsx b/src/components/Project/Infrastructure/WorkArea.jsx
index 479b56ed..439a0b1e 100644
--- a/src/components/Project/Infrastructure/WorkArea.jsx
+++ b/src/components/Project/Infrastructure/WorkArea.jsx
@@ -42,7 +42,7 @@ const WorkArea = ( {workArea, floor, forBuilding} ) =>
               <tbody className="table-border-bottom-0">
                 {workArea?.workItems && workArea.workItems.length > 0 ? (
                   workArea.workItems.map((workItem) => (
-                    <WorkItem key={workItem.workItemId} workItem={workItem} />
+                    <WorkItem key={workItem.workItemId} workItem={workItem} forBuilding={forBuilding} forFloor={floor} forWorkArea={workArea} />
                   ))
                 ) : (
                   <tr>
diff --git a/src/components/Project/Infrastructure/WorkItem.jsx b/src/components/Project/Infrastructure/WorkItem.jsx
index 9b2902a7..278d53db 100644
--- a/src/components/Project/Infrastructure/WorkItem.jsx
+++ b/src/components/Project/Infrastructure/WorkItem.jsx
@@ -39,7 +39,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
     workArea: forWorkArea,
     workItem,
   };
-
+console.log(assigndata)
   const hasWorkItem = NewWorkItem && NewWorkItem
 
   return (
@@ -108,7 +108,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
                 data-bs-target="#project-modal"
                 onClick={openModal}
               >
-                <span className="badge bg-label-primary me-1">Assign</span>
+                <span className="badge  badge-md bg-label-primary me-1">Assign</span>
               </button>
             )}
             <button