diff --git a/src/components/ManageUser.tsx b/src/components/ManageUser.tsx
index 860587c4..f0d7293b 100644
--- a/src/components/ManageUser.tsx
+++ b/src/components/ManageUser.tsx
@@ -481,83 +481,83 @@ const ManageUser: React.FC<ManageUsersProps> = ({
   };
   return (
     <div>
-      {loading ? (
-        <Loader showBackdrop={true} loadingText={t('COMMON.LOADING')} />
-      ) : (
-        <>
-          {/* <Header /> */}
-          <Box>
-           
-          </Box>
-        
-          <Box>
-            {value === 1 && (
-              <>
-                {!isFromFLProfile && (
-                  <Grid
-                    px={'18px'}
-                    spacing={2}
-                    mt={1}
-                    sx={{ display: 'flex', alignItems: 'center' }}
-                    container
-                  >
-                    <Grid item xs={8}>
-                   
-                    </Grid>
-                    <Box mt={'18px'} px={'18px'}>
-                      <Button
-                        sx={{
-                          border: '1px solid #1E1B16',
-                          borderRadius: '100px',
-                          height: '40px',
-                          width: '8rem',
-                          color: theme.palette.error.contrastText,
-                        }}
-                        className="text-1E"
-                        onClick={handleOpenAddFaciModal}
-                        endIcon={<AddIcon />}
-                      >
-                        {t('COMMON.ADD_NEW')}
-                      </Button>
-                    </Box>
-                  </Grid>
-                )}
 
-                <Box>
-                  {isFromFLProfile ? (
-                    <MoreVertIcon
-                      onClick={(event) => {
-                        isMobile ? toggleDrawer('bottom', true, teacherUserId)(event) : handleMenuOpen(event)
+      <>
+        {/* <Header /> */}
+        <Box>
+
+        </Box>
+
+        <Box>
+          {value === 1 && (
+            <>
+              {!isFromFLProfile && (
+                <Grid
+                  px={'18px'}
+                  spacing={2}
+                  mt={1}
+                  sx={{ display: 'flex', alignItems: 'center' }}
+                  container
+                >
+                  <Box mt={'18px'} px={'18px'}>
+                    <Button
+                      sx={{
+                        border: '1px solid #1E1B16',
+                        borderRadius: '100px',
+                        height: '40px',
+                        width: '8rem',
+                        color: theme.palette.error.contrastText,
                       }}
+                      className="text-1E"
+                      onClick={handleOpenAddFaciModal}
+                      endIcon={<AddIcon />}
+                    >
+                      {t('COMMON.ADD_NEW')}
+                    </Button>
+                  </Box>
+                </Grid>
+              )}
+
+              <Box>
+                {isFromFLProfile ? (
+                  <MoreVertIcon
+                    onClick={(event) => {
+                      isMobile ? toggleDrawer('bottom', true, teacherUserId)(event) : handleMenuOpen(event)
+                    }}
+                    sx={{
+                      fontSize: '24px',
+                      marginTop: '1rem',
+                      color: theme.palette.warning['300'],
+                    }}
+                  />
+                ) : (
+                  <Box px={'18px'} mt={3}>
+                    <Box
                       sx={{
-                        fontSize: '24px',
-                        marginTop: '1rem',
-                        color: theme.palette.warning['300'],
+                        display: 'flex',
+                        gap: '20px',
+                        alignItems: 'center',
+                        justifyContent: 'space-between',
+                        paddingBottom: '15px',
                       }}
-                    />
-                  ) : (
-                    <Box px={'18px'} mt={3}>
+                    >
                       <Box
                         sx={{
-                          display: 'flex',
-                          gap: '20px',
+                          gap: '15px',
                           alignItems: 'center',
-                          justifyContent: 'space-between',
-                          paddingBottom: '15px',
+                          '@media (min-width: 600px)': {
+                            background: theme.palette.action.selected,
+                            padding: '20px',
+                            borderRadius: '12px',
+                          },
                         }}
+                        width={'100%'}
                       >
-                        <Box
-                          sx={{
-                            gap: '15px',
-                            alignItems: 'center',
-                            '@media (min-width: 600px)': {
-                              background: theme.palette.action.selected,
-                              padding: '20px',
-                              borderRadius: '12px',
-                            },
-                          }}
-                          width={'100%'}
-                        >
+                        {loading ? (
+                          <Box sx={{ display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center' }}>
+                            <Loader showBackdrop={false} loadingText={t('COMMON.LOADING')} />
+                          </Box>
+                        ) : (
                           <Grid container spacing={2}>
                             {users &&
                               users.length !== 0 &&
@@ -671,175 +671,176 @@ const ManageUser: React.FC<ManageUsersProps> = ({
                               </Box>
                             )}
                           </Grid>
-                        </Box>
+                        )}
                       </Box>
                     </Box>
-                  )}
-
-                  <ManageUsersModal
-                    open={open}
-                    onClose={handleClose}
-                    leanerName={selectedUserName ?? ''}
-                    blockName={selectedUser?.block ?? ''}
-                    centerName={centers}
-                  />
-                  <BottomDrawer
-                    toggleDrawer={toggleDrawer}
-                    state={state}
-                    listItemClick={listItemClick}
-                    setAnchorEl={setAnchorEl}
-                    anchorEl={anchorEl}
-                    isMobile={isMobile}
-                    optionList={[
-                      {
-                        label: t('COMMON.REASSIGN_BLOCKS'),
-                        icon: (
-                          <LocationOnOutlinedIcon
-                            sx={{ color: theme.palette.warning['300'] }}
-                          />
-                        ),
-                        name: 'reassign-block',
-                      },
-                      {
-                        label: t('COMMON.REASSIGN_BLOCKS_REQUEST'),
-                        icon: (
-                          <LocationOnOutlinedIcon
-                            sx={{ color: theme.palette.warning['300'] }}
-                          />
-                        ),
-                        name: 'reassign-block-request',
-                      },
-                      {
-                        label: t('COMMON.DELETE_USER'),
-                        icon: (
-                          <DeleteOutlineIcon
-                            sx={{ color: theme.palette.warning['300'] }}
-                          />
-                        ),
-                        name: 'delete-User',
-                      },
-                    ]}
+                  </Box>
+                )}
+
+                <ManageUsersModal
+                  open={open}
+                  onClose={handleClose}
+                  leanerName={selectedUserName ?? ''}
+                  blockName={selectedUser?.block ?? ''}
+                  centerName={centers}
+                />
+                <BottomDrawer
+                  toggleDrawer={toggleDrawer}
+                  state={state}
+                  listItemClick={listItemClick}
+                  setAnchorEl={setAnchorEl}
+                  anchorEl={anchorEl}
+                  isMobile={isMobile}
+                  optionList={[
+                    {
+                      label: t('COMMON.REASSIGN_BLOCKS'),
+                      icon: (
+                        <LocationOnOutlinedIcon
+                          sx={{ color: theme.palette.warning['300'] }}
+                        />
+                      ),
+                      name: 'reassign-block',
+                    },
+                    {
+                      label: t('COMMON.REASSIGN_BLOCKS_REQUEST'),
+                      icon: (
+                        <LocationOnOutlinedIcon
+                          sx={{ color: theme.palette.warning['300'] }}
+                        />
+                      ),
+                      name: 'reassign-block-request',
+                    },
+                    {
+                      label: t('COMMON.DELETE_USER'),
+                      icon: (
+                        <DeleteOutlineIcon
+                          sx={{ color: theme.palette.warning['300'] }}
+                        />
+                      ),
+                      name: 'delete-User',
+                    },
+                  ]}
+                >
+                  <Box
+                    bgcolor={theme.palette.success.contrastText}
+                    display="flex"
+                    flexDirection="column"
+                    justifyContent="center"
+                    alignItems="left"
+                    margin={'0rem 0.7rem 0rem 0.7rem'}
+                    padding={'1rem'}
+                    borderRadius={'1rem'}
                   >
-                    <Box
-                      bgcolor={theme.palette.success.contrastText}
-                      display="flex"
-                      flexDirection="column"
-                      justifyContent="center"
-                      alignItems="left"
-                      margin={'0rem 0.7rem 0rem 0.7rem'}
-                      padding={'1rem'}
-                      borderRadius={'1rem'}
-                    >
-                      <Box sx={{ fontSize: "12px", fontWeight: 500, color: theme.palette.warning['400'] }}>
-                        {t('COMMON.CENTERS_ASSIGNED', {
-                          block: newStore.block,
-                        })}
-                      </Box>
-                      <Box>
-                        {centers.length > 0 &&
-                          centers.map(
-                            (
-                              name:
-                                | string
-                                | number
-                                | bigint
-                                | boolean
-                                | React.ReactElement<
-                                  any,
-                                  string | React.JSXElementConstructor<any>
-                                >
-                                | Iterable<React.ReactNode>
-                                | React.ReactPortal
-                                | Promise<React.AwaitedReactNode>
-                                | null
-                                | undefined
-                            ) => (
-                              <Button
-                                sx={{
-                                  padding: '6px 12px',
-                                  borderRadius: '8px',
-                                  fontSize: '14px',
-                                  fontWeight: 500,
-                                  border: `1px solid ${theme.palette.warning[900]}`,
-                                  margin: '5px',
-                                }}
-                                className="text-dark-grey"
+                    <Box sx={{ fontSize: "12px", fontWeight: 500, color: theme.palette.warning['400'] }}>
+                      {t('COMMON.CENTERS_ASSIGNED', {
+                        block: newStore.block,
+                      })}
+                    </Box>
+                    <Box>
+                      {centers.length > 0 &&
+                        centers.map(
+                          (
+                            name:
+                              | string
+                              | number
+                              | bigint
+                              | boolean
+                              | React.ReactElement<
+                                any,
+                                string | React.JSXElementConstructor<any>
                               >
-                                {name}
-                              </Button>
-                            )
-                          )}
-                      </Box>
+                              | Iterable<React.ReactNode>
+                              | React.ReactPortal
+                              | Promise<React.AwaitedReactNode>
+                              | null
+                              | undefined
+                          ) => (
+                            <Button
+                              sx={{
+                                padding: '6px 12px',
+                                borderRadius: '8px',
+                                fontSize: '14px',
+                                fontWeight: 500,
+                                border: `1px solid ${theme.palette.warning[900]}`,
+                                margin: '5px',
+                              }}
+                              className="text-dark-grey"
+                            >
+                              {name}
+                            </Button>
+                          )
+                        )}
                     </Box>
-                  </BottomDrawer>
-
-                  <ManageCentersModal
-                    open={openCentersModal}
-                    onClose={handleCloseCentersModal}
-                    centersName={centerList}
-                    centers={centers}
-                    onAssign={handleAssignCenters}
-                  />
-                </Box>
-
-                <ConfirmationModal
-                  message={t('CENTERS.BLOCK_REQUEST')}
-                  handleAction={handleRequestBlockAction}
-                  buttonNames={{
-                    primary: t('COMMON.SEND_REQUEST'),
-                    secondary: t('COMMON.CANCEL'),
-                  }}
-                  handleCloseModal={handleCloseModal}
-                  modalOpen={confirmationModalOpen}
+                  </Box>
+                </BottomDrawer>
+
+                <ManageCentersModal
+                  open={openCentersModal}
+                  onClose={handleCloseCentersModal}
+                  centersName={centerList}
+                  centers={centers}
+                  onAssign={handleAssignCenters}
                 />
-                <ReassignModal
-                  cohortNames={reassignCohortNames}
-                  message={t('COMMON.REASSIGN_BLOCKS')}
-                  handleAction={handleRequestBlockAction}
-                  handleCloseReassignModal={handleCloseReassignModal}
-                  modalOpen={reassignModalOpen}
-                  reloadState={reloadState}
-                  setReloadState={setReloadState}
+              </Box>
+
+              <ConfirmationModal
+                message={t('CENTERS.BLOCK_REQUEST')}
+                handleAction={handleRequestBlockAction}
+                buttonNames={{
+                  primary: t('COMMON.SEND_REQUEST'),
+                  secondary: t('COMMON.CANCEL'),
+                }}
+                handleCloseModal={handleCloseModal}
+                modalOpen={confirmationModalOpen}
+              />
+              <ReassignModal
+                cohortNames={reassignCohortNames}
+                message={t('COMMON.REASSIGN_BLOCKS')}
+                handleAction={handleRequestBlockAction}
+                handleCloseReassignModal={handleCloseReassignModal}
+                modalOpen={reassignModalOpen}
+                reloadState={reloadState}
+                setReloadState={setReloadState}
+              />
+
+              <DeleteUserModal
+                type={Role.TEACHER}
+                userId={userId}
+                open={openDeleteUserModal}
+                onClose={handleCloseModal}
+                onUserDelete={handleDeleteUser}
+                reloadState={reloadState}
+                setReloadState={setReloadState}
+              />
+              <SimpleModal
+                primaryText={t('COMMON.OK')}
+                primaryActionHandler={handleCloseRemoveModal}
+                open={openRemoveUserModal}
+                onClose={handleCloseRemoveModal}
+                modalTitle={t('COMMON.DELETE_USER')}
+              >
+                {' '}
+                <Box mt={1.5} mb={1.5}>
+                  <Typography>
+                    {t('CENTERS.THE_USER_BELONGS_TO_THE_FOLLOWING_COHORT')}{' '}
+                    <strong>{removeCohortNames}</strong>
+                    <br />
+                    {t('CENTERS.PLEASE_REMOVE_THE_USER_FROM_COHORT')}
+                  </Typography>
+                </Box>
+              </SimpleModal>
+              {openAddFacilitatorModal && (
+                <AddFacilitatorModal
+                  open={openAddFacilitatorModal}
+                  onClose={handleCloseAddFaciModal}
+                  onFacilitatorAdded={handleFacilitatorAdded}
                 />
+              )}
+            </>
+          )}
+        </Box>
+      </>
 
-                <DeleteUserModal
-                  type={Role.TEACHER}
-                  userId={userId}
-                  open={openDeleteUserModal}
-                  onClose={handleCloseModal}
-                  onUserDelete={handleDeleteUser}
-                  reloadState={reloadState}
-                  setReloadState={setReloadState}
-                />
-                <SimpleModal
-                  primaryText={t('COMMON.OK')}
-                  primaryActionHandler={handleCloseRemoveModal}
-                  open={openRemoveUserModal}
-                  onClose={handleCloseRemoveModal}
-                  modalTitle={t('COMMON.DELETE_USER')}
-                >
-                  {' '}
-                  <Box mt={1.5} mb={1.5}>
-                    <Typography>
-                      {t('CENTERS.THE_USER_BELONGS_TO_THE_FOLLOWING_COHORT')}{' '}
-                      <strong>{removeCohortNames}</strong>
-                      <br />
-                      {t('CENTERS.PLEASE_REMOVE_THE_USER_FROM_COHORT')}
-                    </Typography>
-                  </Box>
-                </SimpleModal>
-                {openAddFacilitatorModal && (
-                  <AddFacilitatorModal
-                    open={openAddFacilitatorModal}
-                    onClose={handleCloseAddFaciModal}
-                    onFacilitatorAdded={handleFacilitatorAdded}
-                  />
-                )}
-              </>
-            )}
-          </Box>
-        </>
-      )}
     </div>
   );
 };
diff --git a/src/pages/centers/index.tsx b/src/pages/centers/index.tsx
index b6156388..e833151f 100644
--- a/src/pages/centers/index.tsx
+++ b/src/pages/centers/index.tsx
@@ -197,7 +197,7 @@ const TeachingCenters = () => {
   return (
     <>
       <Header />
-      {loading && <Loader showBackdrop={true} loadingText={t('LOADING')} />}
+      {loading && <Loader showBackdrop={false} loadingText={t('LOADING')} />}
       <Box sx={{ padding: '0' }}>
         {accessGranted('showBlockLevelData', accessControl, userRole) ? (
           <>
@@ -299,6 +299,9 @@ const TeachingCenters = () => {
                         '& .MuiOutlinedInput-root': {
                           boxShadow: 'none',
                         },
+                        '@media (min-width: 900px)': {
+                          width: '90%',
+                        },
                       }}
                       InputProps={{
                         endAdornment: (
@@ -323,11 +326,22 @@ const TeachingCenters = () => {
                     />
                   </Box>
                 </Grid>
-                <Grid item xs={4} marginTop={'8px'}>
-                  <Box>
+                <Grid item xs={4}>
+                  <Box sx={{
+                    '@media (min-width: 900px)': {
+                      display: 'flex',
+                      justifyContent: 'end'
+
+                    },
+                  }}>
                     <FormControl
                       className="drawer-select"
-                      sx={{ width: '100%' }}
+                      sx={{
+                        width: '100%',
+                        '@media (min-width: 900px)': {
+                          width: '40%',
+                        },
+                      }}
                     >
                       <Button
                         variant="outlined"
diff --git a/src/pages/user-profile/[userId].tsx b/src/pages/user-profile/[userId].tsx
index f2a7f99f..57b28967 100644
--- a/src/pages/user-profile/[userId].tsx
+++ b/src/pages/user-profile/[userId].tsx
@@ -468,14 +468,14 @@ const TeacherProfile: React.FC<TeacherProfileProp> = ({
               </Box>
               <ManageUser
                 reloadState={reloadState ?? false}
-                setReloadState={setReloadState ?? (() => {})}
+                setReloadState={setReloadState ?? (() => { })}
                 isFromFLProfile={true}
                 teacherUserId={userId}
               />
             </Box>
           )}
 
-{/* <Box padding="5px 19px" className="w-100">
+          {/* <Box padding="5px 19px" className="w-100">
             <Box
               sx={{
                 flex: '1',
@@ -565,6 +565,7 @@ const TeacherProfile: React.FC<TeacherProfileProp> = ({
               //   alignItems: 'center',
               //   flexDirection: 'row-reverse',
               // },
+
             }}
           >
             {userRole === Role.TEAM_LEADER && userId !== selfUserId ? (
@@ -627,13 +628,17 @@ const TeacherProfile: React.FC<TeacherProfileProp> = ({
                 //   minWidth: '60%',
                 //   width: '60%',
                 // },
+                '@media (min-width: 900px)': {
+                  width: '50%'
+                },
               }}
               className="bg-white"
-              minWidth={'100%'}
+              width={'100%'}
               borderRadius={'16px'}
               border={'1px'}
               display="flex"
               flexDirection="row"
+
             >
               <Grid container spacing={4}>
                 {filteredSortedForView?.map((item, index) => {