diff --git a/src/components/Activities/CheckCheckOutForm.jsx b/src/components/Activities/CheckCheckOutForm.jsx
index b820233d..ccce971f 100644
--- a/src/components/Activities/CheckCheckOutForm.jsx
+++ b/src/components/Activities/CheckCheckOutForm.jsx
@@ -7,17 +7,17 @@ import { usePositionTracker } from "../../hooks/usePositionTracker";
 import { useDispatch, useSelector } from "react-redux";
 import { markAttendance } from "../../slices/apiSlice/attedanceLogsSlice";
 import showToast from "../../services/toastService";
-import {checkIfCurrentDate} from "../../utils/dateUtils";
+import { checkIfCurrentDate } from "../../utils/dateUtils";
 
 
 const schema = z.object({
-  markTime: z.string().nonempty({message:"Time is required"}), 
-  description:z.string().max(200,"description should less than 200 chracters").optional()
+  markTime: z.string().nonempty({ message: "Time is required" }),
+  description: z.string().max(200, "description should less than 200 chracters").optional()
 });
 
-const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => {
+const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
 
-  const projectId = useSelector((store)=>store.localVariables.projectId)
+  const projectId = useSelector((store) => store.localVariables.projectId)
   const [isLoading, setIsLoading] = useState(false);
   const coords = usePositionTracker();
   const dispatch = useDispatch()
@@ -29,60 +29,60 @@ const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => {
     reset,
     setValue,
   } = useForm({
-    resolver: zodResolver( schema ),
-    mode:"onChange"
+    resolver: zodResolver(schema),
+    mode: "onChange"
   });
 
-  const onSubmit = ( data ) =>
-  {
-    let record = {...data, date: new Date().toLocaleDateString(),latitude:coords.latitude,longitude:coords.longitude,employeeId:modeldata.employeeId,action:modeldata.action,id:modeldata?.id || null}
-   if(modeldata.forWhichTab === 1){
-    handleSubmitForm(record)
-   } else
-   {
+  const onSubmit = (data) => {
+    let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, employeeId: modeldata.employeeId, action: modeldata.action, id: modeldata?.id || null }
+    if (modeldata.forWhichTab === 1) {
+      handleSubmitForm(record)
+    } else {
 
-    //  if ( modeldata?.currentDate && checkIfCurrentDate( modeldata?.currentDate ) )
-    //  {
-       dispatch(markAttendance(record))
-       .unwrap()
-         .then( ( data ) =>
-         {
-          
-         showToast("Attendance Marked Successfully", "success");
-       })
-         .catch( ( error ) =>
-         {
+      //  if ( modeldata?.currentDate && checkIfCurrentDate( modeldata?.currentDate ) )
+      //  {
+      dispatch(markAttendance(record))
+        .unwrap()
+        .then((data) => {
 
-          showToast(error, "error" );
+          showToast("Attendance Marked Successfully", "success");
+        })
+        .catch((error) => {
+
+          showToast(error, "error");
+
+        });
+
+      //  } else
+      //  {
+      //   let formData = {...data, date: new Date().toLocaleDateString(),latitude:coords.latitude,longitude:coords.longitude,employeeId:modeldata.employeeId,projectId:projectId,action:modeldata.action,id:modeldata?.id || null}
+      //  }
+    }
 
-       });
-       
-    //  } else
-    //  {
-    //   let formData = {...data, date: new Date().toLocaleDateString(),latitude:coords.latitude,longitude:coords.longitude,employeeId:modeldata.employeeId,projectId:projectId,action:modeldata.action,id:modeldata?.id || null}
-    //  }
-     }
-    
     closeModal()
   };
 
   return (
- 
-   
+
+
     <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
-    
+
       <div className="col-12 col-md-12">
-        <TimePicker 
-        label="Choose a time" 
-        onChange={(e) => setValue("markTime", e)}  
-        interval={10}  
-        checkOutTime={modeldata?.checkOutTime}
+        <label className="fs-5 text-dark text-center d-flex align-items-center flex-wrap">
+          {modeldata?.checkInTime && !modeldata?.checkOutTime ? 'Check-out :' : 'Check-in :'}
+        </label>
+      </div>
+      <div className="col-12 col-md-12">
+        <TimePicker
+          label="Choose a time"
+          onChange={(e) => setValue("markTime", e)}
+          interval={10}
+          checkOutTime={modeldata?.checkOutTime}
           checkInTime={modeldata?.checkInTime}
-      />
-        {errors. markTime && <p className="text-danger">{errors.markTime.message}</p>}
+        />
+        {errors.markTime && <p className="text-danger">{errors.markTime.message}</p>}
       </div>
 
-    
       <div className="col-12 col-md-12">
         <label className="form-label" htmlFor="description">
           Description
@@ -91,7 +91,7 @@ const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => {
           rows="3"
           name="description"
           className="form-control"
-          {...register( "description" )}
+          {...register("description")}
           maxLength={200}
         />
         {errors.description && (
@@ -99,7 +99,7 @@ const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => {
         )}
       </div>
 
-     
+
       <div className="col-12 text-center">
         <button type="submit" className="btn btn-sm btn-primary me-3">
           {isLoading ? "Please Wait..." : "Submit"}
@@ -109,7 +109,7 @@ const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => {
           className="btn btn-sm btn-label-secondary"
           data-bs-dismiss="modal"
           aria-label="Close"
-          onClick={()=>closeModal()}
+          onClick={() => closeModal()}
         >
           Cancel
         </button>
@@ -124,15 +124,15 @@ export default CheckCheckOutmodel;
 
 
 const schemaReg = z.object({
-  description:z.string().min(1,{message:"please give reason!"})
-} );
+  description: z.string().min(1, { message: "please give reason!" })
+});
 
 
 
-export const Regularization = ({modeldata,closeModal,handleSubmitForm})=>{
+export const Regularization = ({ modeldata, closeModal, handleSubmitForm }) => {
   const [isLoading, setIsLoading] = useState(false);
   const coords = usePositionTracker();
-  
+
   const {
     register,
     handleSubmit,
@@ -146,22 +146,21 @@ export const Regularization = ({modeldata,closeModal,handleSubmitForm})=>{
     return today.toLocaleDateString('en-CA');
   };
 
-  
-  const onSubmit = ( data ) =>
-  {
 
-    let record = {...data, date: new Date().toLocaleDateString(),latitude:coords.latitude,longitude:coords.longitude, }
+  const onSubmit = (data) => {
+
+    let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, }
     handleSubmitForm(record)
     closeModal()
   };
 
   return (
- 
-   
+
+
     <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
-      
+
       <div className="col-12 col-md-12">
-      <p>Regularize Attendance</p>
+        <p>Regularize Attendance</p>
         <label className="form-label" htmlFor="description">
           Description
         </label>
@@ -176,7 +175,7 @@ export const Regularization = ({modeldata,closeModal,handleSubmitForm})=>{
         )}
       </div>
 
-     
+
       <div className="col-12 text-center">
         <button type="submit" className="btn btn-sm btn-primary me-3">
           {isLoading ? "Please Wait..." : "Submit"}
@@ -186,7 +185,7 @@ export const Regularization = ({modeldata,closeModal,handleSubmitForm})=>{
           className="btn btn-sm btn-label-secondary"
           data-bs-dismiss="modal"
           aria-label="Close"
-          onClick={()=>closeModal()}
+          onClick={() => closeModal()}
         >
           Cancel
         </button>
diff --git a/src/components/master/CreateJobRole.jsx b/src/components/master/CreateJobRole.jsx
index 6b52b10b..739e7e2f 100644
--- a/src/components/master/CreateJobRole.jsx
+++ b/src/components/master/CreateJobRole.jsx
@@ -70,7 +70,9 @@ const CreateJobRole = ({onClose}) => {
     const maxDescriptionLength = 255;    
   return (<>
     <form  className="row g-2" onSubmit={handleSubmit(onSubmit)}>
-      
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Create Job Role</label>
+      </div>
         <div className="col-12 col-md-12">
           <label className="form-label">Role</label>
           <input type="text" 
diff --git a/src/components/master/CreateRole.jsx b/src/components/master/CreateRole.jsx
index 0648cac1..67e8eedf 100644
--- a/src/components/master/CreateRole.jsx
+++ b/src/components/master/CreateRole.jsx
@@ -96,7 +96,10 @@ const CreateRole = ({ modalType, onClose }) => {
   return (
 
     <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Create Application Role</label>
 
+      </div>
       <div className="col-12 col-md-12">
         <label className="form-label">Role</label>
         <input type="text"
diff --git a/src/components/master/CreateWorkCategory.jsx b/src/components/master/CreateWorkCategory.jsx
index 06d08041..0a7bc31b 100644
--- a/src/components/master/CreateWorkCategory.jsx
+++ b/src/components/master/CreateWorkCategory.jsx
@@ -70,6 +70,9 @@ const CreateWorkCategory = ({onClose}) => {
     const maxDescriptionLength = 255;    
   return (<>
     <form  className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Create Work Category</label>        
+      </div>
       
         <div className="col-12 col-md-12">
           <label className="form-label">Category Name</label>
diff --git a/src/components/master/EditJobRole.jsx b/src/components/master/EditJobRole.jsx
index c13fc0d0..965f209a 100644
--- a/src/components/master/EditJobRole.jsx
+++ b/src/components/master/EditJobRole.jsx
@@ -77,6 +77,9 @@ const EditJobRole = ({data,onClose}) => {
      
   return (<>
     <form  className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Edit Job Role</label>        
+      </div>
         <div className="col-12 col-md-12">
           <label className="form-label">Role</label>
           <input type="text" 
diff --git a/src/components/master/EditRole.jsx b/src/components/master/EditRole.jsx
index 4cf31418..3765684f 100644
--- a/src/components/master/EditRole.jsx
+++ b/src/components/master/EditRole.jsx
@@ -146,7 +146,9 @@ const EditMaster = ({ master, onClose }) => {
   return (
 
     <form className="row g-2 " onSubmit={handleSubmit(onSubmit)}>
-
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Edit Application Role</label>
+      </div>
       <div className="col-12 col-md-12">
         <label className="form-label">Role</label>
         <input type="text"
diff --git a/src/components/master/EditWorkCategory.jsx b/src/components/master/EditWorkCategory.jsx
index 124f2d65..3810745c 100644
--- a/src/components/master/EditWorkCategory.jsx
+++ b/src/components/master/EditWorkCategory.jsx
@@ -77,6 +77,10 @@ const EditWorkCategory = ({data,onClose}) => {
      
   return (<>
     <form  className="row g-2" onSubmit={handleSubmit(onSubmit)}>
+      <div className="col-12 col-md-12">
+        <label className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">Edit Work Category</label>        
+      </div>
+      
         <div className="col-12 col-md-12">
           <label className="form-label">Category Name</label>
           <input type="text"