diff --git a/plugins/BottomSheet/BottomSheetAddUserToPositionShiftPlan.jsx b/plugins/BottomSheet/BottomSheetAddUserToPositionShiftPlan.jsx
index ebb4489..20c3559 100644
--- a/plugins/BottomSheet/BottomSheetAddUserToPositionShiftPlan.jsx
+++ b/plugins/BottomSheet/BottomSheetAddUserToPositionShiftPlan.jsx
@@ -82,7 +82,10 @@ const BottomSheetAddUserToPositionShiftPlan = ({
 
   const handleBottomSheetAddUserToPositionShiftPlan = (e) => {
     if (e.type == "OPEN") {
-      CTX.GetUsers();
+      if (!!usersData.length <= 0) {
+        // User data is not in state, send request to get user
+        CTX.GetUsers();
+      }
     } else if (e.type == "CLOSE") {
       // clear();
       // CTX.setGoToEditRole(false);
diff --git a/src/app/shifts/manage-shift/page.jsx b/src/app/shifts/manage-shift/page.jsx
index 5fd3483..a7fc9f8 100644
--- a/src/app/shifts/manage-shift/page.jsx
+++ b/src/app/shifts/manage-shift/page.jsx
@@ -284,7 +284,7 @@ const Calendar = () => {
 
       {shiftPlanSteps >= 3 && (
         <div className="bg-white relative top-[15px] rounded-t-3xl  p-4 rtl  pt-6  sm:h-auto  pb-20">
-          <div className="mx-3 flex justify-center">
+          <div className="mx-3 flex justify-center mb-10">
             <div className=" bg-gray-100 rounded-xl w-fit mr-0 p-3">
               <p className="mb-0 text-right text-sm rtl opacity-80">
                 ویرایش برای{" "}
@@ -303,8 +303,8 @@ const Calendar = () => {
           </div>
 
           {positionsData.map((e) => (
-            <div>
-              <div className="flex justify-between mt-7 bg-gray-200 rounded-2xl">
+            <div className="">
+              <div className="flex justify-between  bg-gray-200 rounded-2xl">
                 <div className="flex p-2">
                   <div className="m-2">
                     <h4 className="text-base  font-bold">{e.name} </h4>
@@ -354,7 +354,7 @@ const Calendar = () => {
             </div> */}
 
               <div
-                className={`flex j flex-wrap mt-3 rtl ${
+                className={`flex j flex-wrap mt-2 rtl ${
                   userAndPositionIds?.length > 0 ? "" : "justify-center"
                 }`}
               >
@@ -362,7 +362,7 @@ const Calendar = () => {
                   userAndPositionIds?.map((item) => (
                     <>
                       {e.id == item.key && (
-                        <div className="flex bg-gray-100 p-1 rounded-full m-1 justify-start mb-5">
+                        <div className="flex bg-gray-100 p-1 rounded-full m-1 justify-start mb-7 ">
                           <div
                             className="w-[30px] h-[30px] rounded-full bg-gray-400 "
                             // onClick={() => deleteSearchUser(e)}