diff --git a/.github/workflows/pratham-aws-deployment.yaml b/.github/workflows/pratham-aws-deployment.yaml
deleted file mode 100644
index 7cae7b3d..00000000
--- a/.github/workflows/pratham-aws-deployment.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Deploy to Pratham-DEV-Deployment on Prahtam-AWS
-on:
-  push:
-    branches:
-      - june15-pilot
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - name: Deploy Stack
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.HOST_NAME_PRATHAM_AWS }}
-          username: ${{ secrets.USERNAME_PRATHAM_AWS }}
-          key: ${{ secrets.EC2_SSH_KEY_PRATHAM_AWS }}
-          port: ${{ secrets.PORT_PRATHAM_AWS }}
-          script: |
-            cd ${{ secrets.TARGET_DIR_PRATHAM_AWS }}
-            ./deploy.sh
diff --git a/.github/workflows/prathamscp-dev.yml b/.github/workflows/pratham-dev-server-deployment.yaml
similarity index 100%
rename from .github/workflows/prathamscp-dev.yml
rename to .github/workflows/pratham-dev-server-deployment.yaml
diff --git a/src/components/CohortFacilitatorList.tsx b/src/components/CohortFacilitatorList.tsx
index 17e80256..7efd6005 100644
--- a/src/components/CohortFacilitatorList.tsx
+++ b/src/components/CohortFacilitatorList.tsx
@@ -5,7 +5,7 @@ import {
   getFieldValue,
   toPascalCase,
 } from '@/utils/Helper';
-import LearnersList from '@/components/LearnersList';
+import LearnersList from '@/components/LearnersListItem';
 import { Status, limit } from '@/utils/app.constant';
 import { showToastMessage } from './Toastify';
 import { useTranslation } from 'next-i18next';
diff --git a/src/components/CohortLearnerList.tsx b/src/components/CohortLearnerList.tsx
index 4534aa6a..047b6b76 100644
--- a/src/components/CohortLearnerList.tsx
+++ b/src/components/CohortLearnerList.tsx
@@ -5,7 +5,7 @@ import {
   getFieldValue,
   toPascalCase,
 } from '@/utils/Helper';
-import LearnersList from '@/components/LearnersList';
+import LearnersListItem from '@/components/LearnersListItem';
 import { Status, limit } from '@/utils/app.constant';
 import { showToastMessage } from './Toastify';
 import { useTranslation } from 'next-i18next';
@@ -84,7 +84,7 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
         <>
           {userData?.map((data: any) => {
             return (
-              <LearnersList
+              <LearnersListItem
                 key={data.userId}
                 userId={data.userId}
                 learnerName={data.name}
diff --git a/src/components/DeleteUserModal.tsx b/src/components/DeleteUserModal.tsx
index 7f1fb656..f5d80c51 100644
--- a/src/components/DeleteUserModal.tsx
+++ b/src/components/DeleteUserModal.tsx
@@ -21,12 +21,12 @@ import { getCohortList } from '@/services/CohortServices';
 import { updateFacilitator } from '@/services/ManageUser';
 
 interface DeleteUserModalProps {
-  deleteFacilitatorId: string;
+  userId: string;
   open: boolean;
   onClose: () => void;
 }
 const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
-  deleteFacilitatorId,
+  userId,
   open,
   onClose,
 }) => {
@@ -67,7 +67,7 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
       reason: selectedValue,
     };
 
-    const response = await updateFacilitator(deleteFacilitatorId, userData);
+    const response = await updateFacilitator(userId, userData);
 
     console.log(response);
 
diff --git a/src/components/DynamicForm.tsx b/src/components/DynamicForm.tsx
index 252e2ecf..c35c9dd0 100644
--- a/src/components/DynamicForm.tsx
+++ b/src/components/DynamicForm.tsx
@@ -156,7 +156,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
       {showTwoButtons ? (
         <>
           <Button
-            variant="contained"
+            variant="outlined"
             color="primary"
             sx={{
               '&.Mui-disabled': {
diff --git a/src/components/GeneratedSchemas.ts b/src/components/GeneratedSchemas.ts
index 56cf7274..3a54ee8d 100644
--- a/src/components/GeneratedSchemas.ts
+++ b/src/components/GeneratedSchemas.ts
@@ -66,7 +66,7 @@ export const GenerateSchemaAndUiSchema = (
         fieldSchema.type = 'string';
         fieldSchema.oneOf = options.map((opt: FieldOption) => ({
           const: opt.value,
-          title: t(`FORM.${opt.label}`),
+          title: t(`FORM.${opt.label}`) === `FORM.${opt.label}` ? opt.label : t(`FORM.${opt.label}`),
         }));
         fieldUiSchema['ui:widget'] = 'select';
         break;
@@ -76,7 +76,7 @@ export const GenerateSchemaAndUiSchema = (
           type: 'string',
           oneOf: options.map((opt: FieldOption) => ({
             const: opt.value,
-            title: t(`FORM.${opt.label}`),
+            title: t(`FORM.${opt.label}`) === `FORM.${opt.label}` ? opt.label : t(`FORM.${opt.label}`),
           })),
         };
         fieldSchema.uniqueItems = true;
@@ -86,7 +86,7 @@ export const GenerateSchemaAndUiSchema = (
         fieldSchema.type = 'string';
         fieldSchema.oneOf = options.map((opt: FieldOption) => ({
           const: opt.value,
-          title: t(`FORM.${opt.label}`),
+          title: t(`FORM.${opt.label}`) === `FORM.${opt.label}` ? opt.label : t(`FORM.${opt.label}`),
         }));
         fieldUiSchema['ui:widget'] = 'CustomRadioWidget';
         break;
@@ -108,7 +108,7 @@ export const GenerateSchemaAndUiSchema = (
         type: 'string',
         oneOf: options.map((opt: FieldOption) => ({
           const: opt.value,
-          title: t(`FORM.${opt.label}`),
+          title: t(`FORM.${opt.label}`) === `FORM.${opt.label}` ? opt.label : t(`FORM.${opt.label}`),
         })),
       };
       fieldSchema.uniqueItems = true;
@@ -121,7 +121,7 @@ export const GenerateSchemaAndUiSchema = (
         type: 'string',
         oneOf: options.map((opt: FieldOption) => ({
           const: opt.value,
-          title: t(`FORM.${opt.label}`),
+          title: t(`FORM.${opt.label}`) === `FORM.${opt.label}` ? opt.label : t(`FORM.${opt.label}`),
         })),
       };
       fieldSchema.uniqueItems = true;
diff --git a/src/components/LearnersList.tsx b/src/components/LearnersListItem.tsx
similarity index 98%
rename from src/components/LearnersList.tsx
rename to src/components/LearnersListItem.tsx
index 8834aee4..7d67aeed 100644
--- a/src/components/LearnersList.tsx
+++ b/src/components/LearnersListItem.tsx
@@ -30,12 +30,13 @@ import { updateCohortMemberStatus } from '@/services/MyClassDetailsService';
 // import Woman2Icon from '@mui/icons-material/Woman2';
 import { useTheme } from '@mui/material/styles';
 import { useTranslation } from 'next-i18next';
+import { useRouter } from 'next/router';
 
 type Anchor = 'bottom';
 const centerList = ['Nashik', 'Shirdi', 'kamptee'];
 const centers = ['shirdi'];
 
-const LearnersList: React.FC<LearnerListProps> = ({
+const LearnersListItem: React.FC<LearnerListProps> = ({
   userId,
   learnerName,
   isDropout,
@@ -58,6 +59,9 @@ const LearnersList: React.FC<LearnerListProps> = ({
     setConfirmationModalReassignCentersOpen,
   ] = React.useState<boolean>(false);
 
+  console.log(userId);
+  
+
   const [learnerState, setLearnerState] = React.useState({
     loading: false,
     isModalOpenLearner: false,
@@ -68,6 +72,8 @@ const LearnersList: React.FC<LearnerListProps> = ({
   });
 
   const theme = useTheme<any>();
+  const router = useRouter();
+  const { learnerId }: any = router.query;
   const { t } = useTranslation();
   const [openCentersModal, setOpenCentersModal] = React.useState(false);
   const [openDeleteUserModal, setOpenDeleteUserModal] = React.useState(false);
@@ -616,9 +622,9 @@ const LearnersList: React.FC<LearnerListProps> = ({
         isForLearner={true}
       />
 
-      <DeleteUserModal open={openDeleteUserModal} onClose={handleCloseModal} />
+      <DeleteUserModal userId={userId} open={openDeleteUserModal} onClose={handleCloseModal} />
     </>
   );
 };
 
-export default LearnersList;
+export default LearnersListItem;
diff --git a/src/components/ManageUser.tsx b/src/components/ManageUser.tsx
index 01265716..e692f995 100644
--- a/src/components/ManageUser.tsx
+++ b/src/components/ManageUser.tsx
@@ -34,7 +34,7 @@ import { editEditUser } from '@/services/ProfileService';
 import ConfirmationModal from '@/components/ConfirmationModal';
 import { Status } from '@/utils/app.constant';
 import AddIcon from '@mui/icons-material/Add';
-import LearnersList from '@/components/LearnersList';
+import LearnersList from '@/components/LearnersListItem';
 import Link from 'next/link';
 import { styled } from '@mui/system';
 import manageUserStore from '../store/manageUserStore';
@@ -116,7 +116,7 @@ const manageUsers: React.FC<ManageUsersProps> = ({
   const [openDeleteUserModal, setOpenDeleteUserModal] = React.useState(false);
   const [openRemoveUserModal, setOpenRemoveUserModal] = React.useState(false);
   const [removeCohortNames, setRemoveCohortNames] = React.useState('');
-  const [deleteFacilitatorId, setDeleteFacilitatorId] = React.useState('');
+  const [userId, setUserId] = React.useState('');
   const CustomLink = styled(Link)(({ theme }) => ({
     textDecoration: 'underline',
     textDecorationColor: theme?.palette?.secondary.main,
@@ -303,7 +303,7 @@ const manageUsers: React.FC<ManageUsersProps> = ({
   const listItemClick = async (event: React.MouseEvent, name: string) => {
     if (name === 'delete-User') {
       const userId = store?.deleteId;
-      setDeleteFacilitatorId(userId);
+      setUserId(userId);
 
       const cohortList = await getCohortList(userId);
       console.log('Cohort List:', cohortList);
@@ -757,7 +757,7 @@ const manageUsers: React.FC<ManageUsersProps> = ({
             />
 
             <DeleteUserModal
-              deleteFacilitatorId={deleteFacilitatorId}
+              userId={userId}
               open={openDeleteUserModal}
               onClose={handleCloseModal}
             />
diff --git a/src/components/SimpleModal.tsx b/src/components/SimpleModal.tsx
index eacaf225..f77d2a21 100644
--- a/src/components/SimpleModal.tsx
+++ b/src/components/SimpleModal.tsx
@@ -45,34 +45,48 @@ const SimpleModal: React.FC<SimpleModalProps> = ({
   const { t } = useTranslation();
   const store = manageUserStore();
   const theme = useTheme<any>();
-  const style = {
-    padding: '20px',
+
+  const modalStyle = {
+    paddingTop: '0', 
+    paddingLeft: theme.spacing(2), 
+    paddingRight: theme.spacing(2), 
+    paddingBottom: theme.spacing(2), 
     position: 'absolute',
     top: '50%',
     left: '50%',
     transform: 'translate(-50%, -50%)',
     width: '85%',
-    boxShadow: 24,
-    bgcolor: '#fff',
-    borderRadius: '16px',
+    maxHeight: '80vh',
+    overflowY: 'auto',
+    backgroundColor: '#fff',
+    borderRadius: theme.shape.borderRadius,
+    boxShadow: theme.shadows[5],
     '@media (min-width: 600px)': {
       width: '450px',
-      maxHeight: '80vh',
-      overflowY: 'auto',
     },
   };
 
+  const titleStyle = {
+    position: 'sticky',
+    top: '0',
+    backgroundColor: '#fff',
+    padding: theme.spacing(2),
+    zIndex: 9999,
+    borderBottom: `1px solid ${theme.palette.divider}`,
+  };
+
   return (
     <Modal
       open={open}
       aria-labelledby="child-modal-title"
       aria-describedby="child-modal-description"
     >
-      <Box sx={{ ...style }}>
+      <Box sx={modalStyle}>
         <Box
           display={'flex'}
           justifyContent={'space-between'}
-          sx={{ padding: '18px 16px' }}
+          // sx={{ padding: '18px 16px' }}
+          sx={titleStyle}
         >
           <Box marginBottom={'0px'}>
             <Typography
diff --git a/src/pages/centers/[cohortId].tsx b/src/pages/centers/[cohortId].tsx
index 5af7aeb1..3ccca520 100644
--- a/src/pages/centers/[cohortId].tsx
+++ b/src/pages/centers/[cohortId].tsx
@@ -14,7 +14,6 @@ import AddLearnerModal from '@/components/AddLeanerModal';
 import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
 import Box from '@mui/material/Box';
 import CenterSessionModal from '@/components/CenterSessionModal';
-import CohortFacilitatorList from '@/components/CohortFacilitatorList';
 import CohortLearnerList from '@/components/CohortLearnerList';
 import { CustomField } from '@/utils/Interfaces';
 import DeleteCenterModal from '@/components/center/DeleteCenterModal';
diff --git a/src/pages/learner/[userId].tsx b/src/pages/learner/[userId].tsx
index 34c8a021..63db5e17 100644
--- a/src/pages/learner/[userId].tsx
+++ b/src/pages/learner/[userId].tsx
@@ -664,6 +664,8 @@ const LearnerProfile: React.FC = () => {
     const userDetails = data;
     try {
       if (userId) {
+        console.log("HELLO");
+        
         const response = await editEditUser(user_id, userDetails);
         ReactGA.event('edit-learner-profile-successful', { userId: userId });
 
diff --git a/src/services/CreateUserService.ts b/src/services/CreateUserService.ts
index 6705fb3b..986039df 100644
--- a/src/services/CreateUserService.ts
+++ b/src/services/CreateUserService.ts
@@ -1,4 +1,5 @@
-import { get } from "./RestClient";
+import { get, post } from "./RestClient";
+import {createUserParam} from '../utils/Interfaces'
 
 export const getFormRead = async (context: string, contextType: string): Promise<any> => {
   const apiUrl: string = `${process.env.NEXT_PUBLIC_BASE_URL}/form/read?context=${context}&contextType=${contextType}`;
@@ -18,3 +19,15 @@ export const getFormRead = async (context: string, contextType: string): Promise
     // throw error;
   }
 };
+
+export const createUser = async (
+  userData: createUserParam): Promise<any> => {
+  const apiUrl: string = `${process.env.NEXT_PUBLIC_BASE_URL}/create`;
+  try {
+    const response = await post(apiUrl, { userData });
+    return response?.data?.result;
+  } catch (error) {
+    console.error('error in getting cohort list', error);
+    throw error;
+  }
+};
diff --git a/src/utils/Interfaces.ts b/src/utils/Interfaces.ts
index b1ecfed6..85d32f53 100644
--- a/src/utils/Interfaces.ts
+++ b/src/utils/Interfaces.ts
@@ -365,3 +365,22 @@ export interface FacilitatorDeleteUserData {
   status: string;
   reason: string;
 }
+
+export interface TenantCohortRoleMapping {
+  tenantId: string;
+  roleId: string;
+}
+
+export interface CustomField {
+  fieldId: string;
+  value: string;
+}
+
+export interface createUserParam {
+  username: string;
+  name: string;
+  email: string;
+  password: string;
+  tenantCohortRoleMapping: TenantCohortRoleMapping[];
+  customFields: CustomField[];
+}
\ No newline at end of file