diff --git a/api/src/models/FieldMapper.ts b/api/src/models/FieldMapper.ts
index 8e25c6d2d..4a9cbd772 100644
--- a/api/src/models/FieldMapper.ts
+++ b/api/src/models/FieldMapper.ts
@@ -10,6 +10,10 @@ interface Advanced {
   Multiple: boolean;
   Unique: boolean;
   NonLocalizable: boolean;
+  EmbedObject: boolean;
+  EmbedObjects:any;
+  MinChars: string;
+  MaxChars: number;
 }
 
 /**
diff --git a/api/src/models/project-lowdb.ts b/api/src/models/project-lowdb.ts
index d73d67566..e5c03ce9c 100644
--- a/api/src/models/project-lowdb.ts
+++ b/api/src/models/project-lowdb.ts
@@ -62,6 +62,7 @@ interface Project {
   isNewStack: boolean;
   newStackId: string;
   stackDetails: [];
+  mapper_keys: [];
 }
 
 interface ProjectDocument {
diff --git a/api/src/services/contentMapper.service.ts b/api/src/services/contentMapper.service.ts
index f71fac676..ca90cd8f3 100644
--- a/api/src/services/contentMapper.service.ts
+++ b/api/src/services/contentMapper.service.ts
@@ -51,7 +51,7 @@ const putTestData = async (req: Request) => {
       const id = field?.id?.replace(/[{}]/g, "")?.toLowerCase() || uuidv4();
       field.id = id;
       fieldIds.push(id);
-      return { id, projectId, isDeleted: true, ...field };
+      return { id, projectId, isDeleted: false, ...field };
     });
     FieldMapperModel.update((data: any) => {
       data.field_mapper = [...(data?.field_mapper ?? []), ...fields];
@@ -419,7 +419,7 @@ const updateContentType = async (req: Request) => {
         if (fieldIndex > -1 && field?.ContentstackFieldType !== "") {
           FieldMapperModel.update((data: any) => {
             data.field_mapper[fieldIndex] = field;
-            data.field_mapper[fieldIndex].isDeleted = false;
+            //data.field_mapper[fieldIndex].isDeleted = false;
           });
         }
       });
diff --git a/api/src/services/org.service.ts b/api/src/services/org.service.ts
index 1719ce781..ef82b56b6 100644
--- a/api/src/services/org.service.ts
+++ b/api/src/services/org.service.ts
@@ -38,7 +38,7 @@ const getAllStacks = async (req: Request): Promise<LoginServiceType> => {
         },
       })
     );
-
+    // console.info(err, res);
     if (err) {
       logger.error(
         getLogMessage(
@@ -63,10 +63,12 @@ const getAllStacks = async (req: Request): Promise<LoginServiceType> => {
         );
       });
     }
-    const locale = await getStackLocal(token_payload, stacks);
+    // const locale:any[]
+    // const locale = await getStackLocal(token_payload, stacks);
     return {
       data: {
-        stacks: locale,
+        // stacks: locale,
+        stacks,
       },
       status: res.status,
     };
diff --git a/api/src/services/projects.service.ts b/api/src/services/projects.service.ts
index a3f7b949a..57593b4d3 100644
--- a/api/src/services/projects.service.ts
+++ b/api/src/services/projects.service.ts
@@ -1002,7 +1002,7 @@ const updateContentMapper = async (req: Request) => {
 
   try {
     ProjectModelLowdb.update((data: any) => {
-      data.projects[projectIndex].content_mapper = content_mapper;
+      data.projects[projectIndex].mapper_keys = content_mapper;
       data.projects[projectIndex].updated_at = new Date().toISOString();
     });
 
diff --git a/ui/src/App.tsx b/ui/src/App.tsx
index cc3ccdfca..db1aa1166 100644
--- a/ui/src/App.tsx
+++ b/ui/src/App.tsx
@@ -1,4 +1,4 @@
-import { Suspense } from 'react';
+import { Suspense, useEffect } from 'react';
 import { Provider } from 'react-redux';
 import { PersistGate } from 'redux-persist/integration/react';
 import { FullPageLoader } from '@contentstack/venus-components';
@@ -18,6 +18,20 @@ import { useNetworkCheck } from './components/NetworkProvider';
 function App() {
   const isOnline = useNetworkCheck();
 
+  useEffect(() => {
+    const selectModal = document.querySelector('.ReactModalPortal');
+    
+    if (selectModal instanceof HTMLElement) {
+      if (!isOnline) {
+        // Hide the modal by setting display to none
+        selectModal.style.display = 'none';
+      } else {
+        // Show the modal by setting display to block
+        selectModal.style.display = 'block';
+      }
+    }
+  }, [isOnline]);
+
   return (
     <>
       {isOnline ? (
@@ -38,5 +52,4 @@ function App() {
     </>
   );
 }
-
 export default App;
diff --git a/ui/src/cmsData/region_login.json b/ui/src/cmsData/region_login.json
index 507b185ca..c4ed384da 100644
--- a/ui/src/cmsData/region_login.json
+++ b/ui/src/cmsData/region_login.json
@@ -53,7 +53,7 @@
       "_metadata": { "uid": "cs77a3bf15c456afbb" }
     },
     {
-      "region": "EU",
+      "region": "GCP_NA",
       "service_icon": {
           "uid": "blt57dafa9c1472b46f",
           "created_at": "2024-07-29T10:57:59.058Z",
@@ -82,7 +82,7 @@
       }
     },
     {
-      "region": "AZURE_EU",
+      "region": "EU",
       "service_icon": {
         "uid": "bltbe45879eac0025d8",
         "created_at": "2023-10-31T06:59:22.783Z",
@@ -106,7 +106,7 @@
       "_metadata": { "uid": "csf578f8fbea1ae0c0" }
     },
     {
-      "region": "GCP_NA",
+      "region": "AZURE_EU",
       "service_icon": {
         "uid": "blt85d2a7024c613199",
         "created_at": "2023-10-31T07:00:56.567Z",
diff --git a/ui/src/components/AdvancePropertise/advanceProperties.interface.ts b/ui/src/components/AdvancePropertise/advanceProperties.interface.ts
index 0e5a15db0..bf2011839 100644
--- a/ui/src/components/AdvancePropertise/advanceProperties.interface.ts
+++ b/ui/src/components/AdvancePropertise/advanceProperties.interface.ts
@@ -116,6 +116,10 @@ export interface UpdatedSettings {
    * Indicates whether the component is non-localizable.
    */
   NonLocalizable?: boolean;
+
+  Multiple?: boolean;
+
+  EmbedObjects?: any
 }
 
 /**
diff --git a/ui/src/components/AdvancePropertise/index.tsx b/ui/src/components/AdvancePropertise/index.tsx
index 060d9f937..1f55644c7 100644
--- a/ui/src/components/AdvancePropertise/index.tsx
+++ b/ui/src/components/AdvancePropertise/index.tsx
@@ -22,6 +22,11 @@ import { ContentType } from '../ContentMapper/contentMapper.interface';
 // Styles
 import './index.scss';
 
+interface ContentTypeOption {
+  label: string;
+  value: string;
+}
+
 /**
  * Component for displaying advanced properties.
  * @param props - The schema properties.
@@ -44,17 +49,23 @@ const AdvancePropertise = (props: SchemaProps) => {
     allowImagesOnly: props?.value?.AllowImagesOnly,
     nonLocalizable: props?.value?.NonLocalizable,
     embedObject: true,
-    embedAssests: true
+    embedAssests: true,
+    multiple: props?.value?.Multiple,
+    embedObjects: props?.value?.EmbedObjects
   });
 
+  const embedObjects = props?.value?.EmbedObjects?.map((item: string) => ({
+    label: item,
+    value: item,
+  }));
   // State for content types
   const [contentTypes, setContentTypes] = useState<ContentType[]>([]);
-  const [ctValue, setCTValue] = useState(null);
+  const [ctValue, setCTValue] = useState<ContentTypeOption[] | null>(embedObjects);
+  const [embedObjectslabels, setEmbedObjectsLabels] = useState<string[]>(props?.value?.EmbedObjects);
 
   useEffect(() => {
     fetchContentTypes('');
   }, [])
-
   /**
    * Fetches the content types list.
    * @param searchText - The search text.
@@ -77,16 +88,27 @@ const AdvancePropertise = (props: SchemaProps) => {
       [field]: (event.target as HTMLInputElement)?.value
     }));
 
+    const currentToggleStates = {
+      ...toggleStates,
+      [field]: (event.target as HTMLInputElement)?.value,
+    };
+
     props?.updateFieldSettings(
       props?.rowId,
       {
+        ...props?.value,
         [field?.charAt(0)?.toUpperCase() + field?.slice(1)]: (event.target as HTMLInputElement)?.value,
         validationRegex: '',
-        Mandatory: false,
-        Multiple: false,
+        MinChars: currentToggleStates?.minChars,
+        MaxChars:currentToggleStates?.maxChars,
+        Mandatory: currentToggleStates?.mandatory,
+        Multiple: currentToggleStates?.multiple,
         Unique: false,
-        NonLocalizable: false,
-        EmbedObject: false
+        NonLocalizable: currentToggleStates?.nonLocalizable,
+        EmbedObject: currentToggleStates?.embedObject,
+        EmbedObjects: embedObjectslabels,
+        MinRange: currentToggleStates?.minRange,
+        MaxRange: currentToggleStates?.maxRange,
       },
       checkBoxChanged
     );
@@ -103,22 +125,35 @@ const AdvancePropertise = (props: SchemaProps) => {
       ...prevStates,
       [field]: value
     }));
-
+    const currentToggleStates = {
+      ...toggleStates,
+      [field]: value,
+    };
+    
     props?.updateFieldSettings(
       props?.rowId,
       {
         [field?.charAt(0)?.toUpperCase() + field?.slice(1)]: value,
         validationRegex: '',
-        Mandatory: false,
-        Multiple: false,
+        Mandatory: currentToggleStates?.mandatory,
+        Multiple: currentToggleStates?.multiple,
         Unique: false,
-        NonLocalizable: false,
-        EmbedObject: false
+        NonLocalizable: currentToggleStates?.nonLocalizable,
+        EmbedObject: currentToggleStates?.embedObject,
+        EmbedObjects : embedObjectslabels
       },
       checkBoxChanged
     );
   };
 
+  useEffect(() => {
+
+    if (ctValue && Array.isArray(ctValue)) {
+      const labels = ctValue.map((item) => item.label);
+      setEmbedObjectsLabels(labels);
+    }
+  }, [ctValue]);
+
   // Option for content types
   const option = Array.isArray(contentTypes)
     ? contentTypes.map((option) => ({ label: option?.otherCmsTitle, value: option?.otherCmsTitle }))
@@ -323,7 +358,18 @@ const AdvancePropertise = (props: SchemaProps) => {
                     <Select
                       value={ctValue}
                       isMulti={true}
-                      onChange={setCTValue}
+                      onChange={(selectedOptions:any) => {
+                        setCTValue(selectedOptions); 
+                        const embedObject = selectedOptions.map((item: any) => item.label);// Update the state with the selected options
+                        props?.updateFieldSettings(
+                          props?.rowId,
+                        {
+                          validationRegex : toggleStates?.validationRegex || '',
+                          EmbedObjects: embedObject
+                        },
+                        true,
+                         ); 
+                      }}
                       options={option}
                       placeholder="Select Content Types"
                       version='v2'
@@ -334,16 +380,6 @@ const AdvancePropertise = (props: SchemaProps) => {
                     />
                   )}
 
-                  <div className='ToggleWrap'>
-                    <ToggleSwitch
-                      label="Embed Asset(s)"
-                      labelColor="primary"
-                      labelPosition="right"
-                      checked={toggleStates?.embedAssests}
-                      disabled={toggleStates?.embedAssests}
-                      onChange={handleToggleChange && ((e: React.MouseEvent<HTMLElement>) => handleToggleChange('embedAssests', (e.target as HTMLInputElement)?.checked, true))}
-                    />
-                  </div>
                 </>
               )}
               {props?.fieldtype !== 'Global' && (
@@ -357,18 +393,6 @@ const AdvancePropertise = (props: SchemaProps) => {
                   />
                 </div>
               )}
-              
-              {props?.fieldtype === 'File' && (
-                <div className='ToggleWrap'>
-                  <ToggleSwitch
-                    label="Allow Images Only"
-                    labelColor="primary"
-                    labelPosition="right"
-                    checked={toggleStates?.allowImagesOnly}
-                    onChange={handleToggleChange && ((e: React.MouseEvent<HTMLElement>) => handleToggleChange('allowImagesOnly', (e.target as HTMLInputElement)?.checked, true))}
-                  />
-                </div>
-              )}
 
               <div className='ToggleWrap'>
                 <Tooltip
diff --git a/ui/src/components/Card/index.tsx b/ui/src/components/Card/index.tsx
index 9cbbe49e6..496f4c6bb 100644
--- a/ui/src/components/Card/index.tsx
+++ b/ui/src/components/Card/index.tsx
@@ -70,7 +70,7 @@ const CardList = ({ project }: ProjectType) => {
   // }, [selectedOrganisation?.value, project?.id]);
 
   return (
-    <div style={{ margin: '0 20px 20px 0' }}>
+    <div style={{ margin: '0 19px 20px 0' }}>
       <div onClick={() => onClickProject(project?.id || '')}>
         <div className="ProjectCard">
           <div className='ProjectCardWrapper'>
diff --git a/ui/src/components/Common/Card/card.scss b/ui/src/components/Common/Card/card.scss
index f68e8824c..e3dcbd605 100644
--- a/ui/src/components/Common/Card/card.scss
+++ b/ui/src/components/Common/Card/card.scss
@@ -143,13 +143,6 @@
  * CSS class for a centered card title.
  * Adds a margin of 10px to the title.
  */
-.centered-card-title {
-  margin: 10px;
-}
-.centered-card-title{
-  margin: 10px;
-}
-
 .centered-card-title {
   margin: 10px;
   p {
diff --git a/ui/src/components/ContentMapper/contentMapper.interface.ts b/ui/src/components/ContentMapper/contentMapper.interface.ts
index 03b49061e..fc9e3b424 100644
--- a/ui/src/components/ContentMapper/contentMapper.interface.ts
+++ b/ui/src/components/ContentMapper/contentMapper.interface.ts
@@ -73,6 +73,11 @@ export interface Advanced {
   Unique?: boolean;
   NonLocalizable?: boolean;
   EmbedObject?: boolean;
+  EmbedObjects?:any;
+  MinChars?: string;
+  MaxChars?: number;
+  MinRange?: number,
+  MaxRange?: number,
 }
 
 export interface ItemStatus {
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 8ba4b603a..3d8fda7c0 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -278,6 +278,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
   let updatedRows: FieldMapType[] = tableData;
   let updatedExstingField: ExistingFieldType = existingField;
   const updatedSelectedOptions: string[] = selectedOptions; 
+  const [initialRowSelectedData, setInitialRowSelectedData] = useState();
 
   /** ALL HOOKS Here */
   const { projectId = '' } = useParams();
@@ -329,26 +330,59 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
   }, [contentTypeMapped, otherCmsTitle]);
 
   useEffect(() => {
-    const updatedExstingField: ExistingFieldType = {};
     const checkKey = Object.keys(contentTypeMapped).find(key => contentTypeMapped[key] === contentTypeMapped[otherCmsTitle]);
 
-    if (checkKey === otherCmsTitle) {
+    // if (checkKey === otherCmsTitle) {
       tableData?.forEach((row) => {
-        if (row?.contentstackField) {
-          updatedExstingField[row?.uid] = {
-            label: row?.contentstackField,
-            value: row?.contentstackField
-          };
-        }
+        contentTypeSchema?.forEach((schema) => {
+          
+          if (row?.contentstackField === schema?.display_name) {
+            updatedExstingField[row?.uid] = {
+              label: schema?.display_name,
+              value: schema
+            };
+          }
+
+          if(schema?.schema) {
+            schema?.schema?.forEach((childSchema) => {
+              if(row?.contentstackField === `${schema?.display_name} > ${childSchema?.display_name}`){
+                
+                updatedExstingField[row?.uid] = {
+                  label: `${schema?.display_name} > ${childSchema?.display_name}`,
+                  value: childSchema
+                }
+              }
+            })
+          }
+        });
       });
-      //setExistingField(updatedExstingField);
-    }
+      
+      setExistingField(updatedExstingField);
+    // }
   }, [tableData, otherCmsTitle]);
 
+  useEffect(() => {
+    if (isUpdated) {     
+      setTableData(updatedRows);
+      setExistingField(updatedExstingField);
+      setSelectedOptions(updatedSelectedOptions);
+      setSelectedEntries(updatedRows);
+      setIsUpdated(false);
+    }
+    else{
+      setExistingField({});
+      setSelectedOptions([]);
+
+    }
+  }, [isUpdated, otherContentType]);
+
   // To make all the fields checked
   useEffect(() => {
     const selectedId = tableData.reduce<UidMap>((acc, item) => {
-      acc[item?.id] = true;
+      if(! item?.isDeleted){
+        acc[item?.id] = true;
+
+      }
       return acc;
     }, {});
     
@@ -447,6 +481,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
       
       setTableData(newTableData || []);
       setTotalCounts(data?.count);
+      setInitialRowSelectedData(newTableData.filter((item:any) => !item.isDeleted))
       
       generateSourceGroupSchema(data?.fieldMapping);
     } catch (error) {
@@ -547,8 +582,8 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
       }
       return row;
     });
-
     setTableData(newTableData);
+    setSelectedEntries(newTableData);
   };
 
   const handleSchemaPreview = (title: string) => {
@@ -579,30 +614,122 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
     );
   };
 
-  // Function to handle selected fields
   const handleSelectedEntries = (singleSelectedRowIds: string[], selectedData: FieldMapType[]) => {
     const selectedObj: UidMap = {};
-
+    let Ischild = false;
+  
     singleSelectedRowIds.forEach((uid: string) => {
-      selectedObj[uid] = true;
+      const isId = selectedData?.some((item) => item?.id === uid);
+      if (isId) {
+        selectedObj[uid] = true;
+      }
     });
-    
+  
+    // Iterate over each item in selectedData to handle group and child selection logic
+    selectedData?.forEach((item) => {
+
+      // Extract the group UID if item is child of any group
+      const uidBeforeDot = item?.uid?.split('.')[0];
+      const groupItem = tableData?.find((entry) => entry?.uid === uidBeforeDot);
+  
+      if (groupItem) {
+        // Mark the group item as selected if any child of group is selected
+        selectedObj[groupItem?.id] = true;
+      }
+  
+      // If the item is a group, handle its child items
+      if (item?.otherCmsType === 'Group') {
+
+        // Get all child items of the group
+        const newEle = tableData?.filter((entry) => entry?.uid?.startsWith(item?.uid + '.'));
+  
+        if (newEle && validateArray(newEle)) {
+          
+          const allChildrenNotSelected = newEle.every(child => !selectedObj[child?.id || '']);
+          if (allChildrenNotSelected) {
+            
+            //if none of the child of group is selected then mark the child items as selected
+            newEle.forEach((child) => {
+              Ischild = true;
+              selectedObj[child?.id || ''] = true;
+            });
+          }
+        }
+      } 
+      else {
+        // If the item is not a group, mark it as selected in selectedObj
+        selectedObj[item?.id] = true;
+      }
+    });
+  
     const uncheckedElements = findUncheckedElement(selectedData, tableData);
+ 
     uncheckedElements && validateArray(uncheckedElements) && uncheckedElements?.forEach((field) => {
       if (field?.otherCmsType === "Group") {
-        const newEle = selectedData?.filter((entry) => entry?.uid?.startsWith(field?.uid + '.'))
 
-        newEle && validateArray(newEle) && newEle.forEach((child) => {
-          selectedObj[child?.id || ''] = false;
-          selectedData?.splice(selectedData?.indexOf(child), 1);
-        })
+        // Get all child items of the unchecked group
+        const childItems = tableData?.filter((entry) => entry?.uid?.startsWith(field?.uid + '.'));
+  
+        if (childItems && validateArray(childItems)) {
+
+          // Check if all children are selected
+          const allChildrenSelected = childItems.every(child => selectedObj[child?.id || '']);
+          
+          if (allChildrenSelected) {
+            childItems.forEach((child) => {
+
+              // Remove each child item from selected
+              delete selectedObj[child?.id || ''];
+              
+            });
+            delete selectedObj[field?.id || ''];
+          }
+        }
+      } 
+      else {
+
+        // Extract the group UID if item is child of any group
+        const uidBeforeDot = field?.uid?.split('.')[0];
+        const groupItem = selectedData?.find((entry) => entry?.uid === uidBeforeDot);
+        const childItems = tableData?.filter((entry) => entry?.uid?.startsWith(groupItem?.uid + '.'));
+
+        if (childItems && validateArray(childItems)) {
+
+          // Check if all children are not selected of group
+          const allChildrenSelected = childItems.every(child => !selectedObj[child?.id || '']);
+          
+          if (allChildrenSelected) {
+            
+            childItems.forEach((child) => {
+              delete selectedObj[child?.id || ''];
+              
+            });
+            delete selectedObj[groupItem?.id || ''];
+          }
+        }
+  
+        if (!Ischild) {
+
+          delete selectedObj[field?.id || ''];
+        }
       }
-    })
+    });
+    const updatedTableData = tableData.map((tableItem) => {
+      const found = selectedData.some((selectedItem) => selectedItem.uid === tableItem.uid);
+      
+      // Mark the item as deleted if not found in selectedData
+      return {
+        ...tableItem,
+        isDeleted: !found ? true : false,
+      };
+    });
+  
 
     setRowIds(selectedObj);
-    setSelectedEntries(selectedData);
+    setSelectedEntries(updatedTableData);
   };
-
+  
+ 
   // Function to find unchecked field
   const findUncheckedElement = (selectedData: FieldMapType[], tableData: FieldMapType[]) => {
     return tableData.filter((mainField: FieldMapType) => 
@@ -715,7 +842,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
               icon="Sliders"
               size="small"
               onClick={() =>
-                handleAdvancedSetting(fieldLabel, advancePropertise, data?.uid, data)
+                handleAdvancedSetting(fieldLabel, data?.advanced || {}, data?.uid, data)
               }
             />
           </Tooltip>
@@ -727,8 +854,17 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
   const handleFieldChange = (selectedValue: FieldTypes, rowIndex: string) => {
     setIsDropDownChanged(true);
     const previousSelectedValue = existingField[rowIndex]?.label;
+    const groupArray = nestedList.filter(item => 
+      item?.child?.some(e => e?.id)
+    )
+    if(groupArray[0].child && previousSelectedValue !== selectedValue?.label && groupArray[0]?.uid === rowIndex){
+       for(const item of groupArray[0].child){
+        delete existingField[item?.uid]
+       }
+    }
 
-    setExistingField((prevOptions) => ({
+    
+    setExistingField((prevOptions: any) => ({
       ...prevOptions,
       [rowIndex]: { label: selectedValue?.label, value: selectedValue?.value }
     }));
@@ -765,12 +901,15 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
         return {
           ...row,
           contentstackField: selectedValue?.label,
+          contentstackFieldUid: selectedValue?.value?.uid,
           advanced: {
             validationRegex: selectedValue?.value?.format,
             Mandatory: selectedValue?.value?.mandatory,
             Multiple: selectedValue?.value?.multiple,
             Unique: selectedValue?.value?.unique,
-            NonLocalizable: selectedValue?.value?.non_localizable
+            NonLocalizable: selectedValue?.value?.non_localizable,
+            MinChars: selectedValue?.value?.max,
+            MaxChars: selectedValue?.value?.min
           }
         };
       }
@@ -864,7 +1003,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
     currentDisplayName = ''
   ) => {
     // Update the current display name with the current value's display name
-    const updatedDisplayName = currentDisplayName ? `${currentDisplayName} '>' ${value?.display_name}` : value?.display_name;
+    const updatedDisplayName = currentDisplayName ? `${currentDisplayName} > ${value?.display_name}` : value?.display_name;
   
     if (value?.data_type === 'group') {
 
@@ -1021,6 +1160,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
             return {
               ...row,
               contentstackField: OptionsForRow[0]?.value?.display_name ?? '',
+              contentstackFieldUid: OptionsForRow[0]?.value?.uid ?? '',
               advanced: {
                 validationRegex: OptionsForRow[0]?.value?.format ?? '',
                 Mandatory: OptionsForRow[0]?.value?.mandatory,
@@ -1042,7 +1182,9 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
     
         // Check if there's already a matching entry in updatedExstingField
         const hasMatchingEntry = Object.values(updatedExstingField).some(         
-          (entry) =>{ return entry?.label === newLabel }
+          (entry) =>{ 
+            return entry?.label === newLabel 
+          }
         );
         
         if (!hasMatchingEntry) {
@@ -1138,15 +1280,20 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
               data?.otherCmsField === 'url'
             }
           >
-            <Icon
-            version="v2"
+          <Button
+          buttonType="light"
+          disabled={contentTypeSchema && existingField[data?.uid] ? true : false}>
+          <Icon
+            version={'v2'}
             icon="Sliders"
             size="small"
             onClick={() => {
-              handleAdvancedSetting(initialOption?.label, advancePropertise, data?.uid, data);
+              handleAdvancedSetting(initialOption?.label, data?.advanced || {}, data?.uid, data);
             }}
           />
 
+          </Button>
+          
           </Tooltip>
           
         )}
@@ -1155,20 +1302,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
   };
 
 
-  useEffect(() => {
-    if (isUpdated) {     
-      setTableData(updatedRows);
-      setExistingField(updatedExstingField);
-      setSelectedOptions(updatedSelectedOptions);
-      setSelectedEntries(updatedRows);
-      setIsUpdated(false);
-    }
-    else{
-      setExistingField({});
-      setSelectedOptions([]);
-
-    }
-  }, [isUpdated, otherContentType]);
+  
  
   const handleSaveContentType = async () => {
     const orgId = selectedOrganisation?.uid;
@@ -1212,6 +1346,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
           fieldMapping: selectedEntries
         }
       };
+     
       const { data } = await updateContentType(
         orgId,
         projectID,
@@ -1553,7 +1688,7 @@ const ContentMapper = forwardRef(({projectData}: ContentMapperComponentProps, re
               tableHeight={tableHeight}
               equalWidthColumns={true}
               columnSelector={false}
-              initialRowSelectedData={tableData}
+              initialRowSelectedData={initialRowSelectedData}
               initialSelectedRowIds={rowIds}
               itemSize={80}
               withExportCta={{
diff --git a/ui/src/components/DestinationStack/DestinationStack.scss b/ui/src/components/DestinationStack/DestinationStack.scss
index 3dd0b32ed..27a29f24a 100644
--- a/ui/src/components/DestinationStack/DestinationStack.scss
+++ b/ui/src/components/DestinationStack/DestinationStack.scss
@@ -50,6 +50,7 @@
     background-color: $color-brand-white-base;
     .description {
       line-height: 24px;
+      font-family: $font-family-primary;
     }
     .step_block {
       padding: 0 !important;
diff --git a/ui/src/components/LegacyCms/index.tsx b/ui/src/components/LegacyCms/index.tsx
index 57252053c..e78a863df 100644
--- a/ui/src/components/LegacyCms/index.tsx
+++ b/ui/src/components/LegacyCms/index.tsx
@@ -17,7 +17,6 @@ import { isEmptyString, validateArray } from '../../utilities/functions';
 import { ICardType, defaultCardType } from '../Common/Card/card.interface';
 import './legacyCms.scss';
 import { IFilterType } from '../Common/Modal/FilterModal/filterModal.interface';
-import { MigrationResponse } from '../../services/api/service.interface';
 import { getCMSDataFromFile } from '../../cmsData/cmsSelector';
 import { RootState } from '../../store';
 import {  updateMigrationData, updateNewMigrationData } from '../../store/slice/migrationDataSlice';
@@ -40,7 +39,6 @@ interface LegacyCmsData {
 }
 type LegacyCMSComponentProps = {
   legacyCMSData: LegacyCmsData;
-  projectData: MigrationResponse;
   isCompleted: boolean
   handleStepChange: (currentStep: number) => void;
   handleOnAllStepsComplete:(flag : boolean)=>void;
@@ -51,7 +49,7 @@ interface AutoVerticalStepperRef {
 }
 
 
-const LegacyCMSComponent = forwardRef(({ legacyCMSData, projectData, isCompleted, handleOnAllStepsComplete, }: LegacyCMSComponentProps, ref) => {
+const LegacyCMSComponent = forwardRef(({ legacyCMSData, isCompleted, handleOnAllStepsComplete, }: LegacyCMSComponentProps, ref) => {
   //react-redux apis
   const migrationData = useSelector((state:RootState)=>state?.migration?.migrationData);
   const  newMigrationData = useSelector((state:RootState)=>state?.migration?.newMigrationData);
@@ -171,30 +169,30 @@ const LegacyCMSComponent = forwardRef(({ legacyCMSData, projectData, isCompleted
       ) {
         setInternalActiveStepIndex(2);
       }   
-      dispatch(updateNewMigrationData({
-        ...newMigrationData,
-        legacy_cms: {
-          currentStep: internalActiveStepIndex,
-          selectedCms: selectedCmsData,
-          selectedFileFormat: selectedFileFormatData || newMigrationData?.legacy_cms?.selectedFileFormat ,
-          uploadedFile: {
-            file_details:{
-              localPath: legacyCMSData?.file_path,
-              awsData: legacyCMSData?.awsDetails,
-              isLocalPath: legacyCMSData?.is_localPath
-            },
-            isValidated: legacyCMSData?.is_fileValid ,
-          }, //need to add backend data once endpoint exposed.
-          affix: legacyCMSData?.affix || '',
-          isFileFormatCheckboxChecked: true, //need to add backend data once endpoint exposed.
-          isRestictedKeywordCheckboxChecked: true //need to add backend data once endpoint exposed.
-        }
-      }))
+      // dispatch(updateNewMigrationData({
+      //   ...newMigrationData,
+      //   legacy_cms: {
+      //     currentStep: internalActiveStepIndex,
+      //     //selectedCms: selectedCmsData,
+      //     //selectedFileFormat: selectedFileFormatData || newMigrationData?.legacy_cms?.selectedFileFormat ,
+      //     uploadedFile: {
+      //       file_details:{
+      //         localPath: legacyCMSData?.file_path,
+      //         awsData: legacyCMSData?.awsDetails,
+      //         isLocalPath: legacyCMSData?.is_localPath
+      //       },
+      //       isValidated: legacyCMSData?.is_fileValid || newMigrationData?.legacy_cms?.uploadedFile?.isValidated ,
+      //     }, //need to add backend data once endpoint exposed.
+      //     //affix: legacyCMSData?.affix || '',
+      //     //isFileFormatCheckboxChecked: true, //need to add backend data once endpoint exposed.
+      //     isRestictedKeywordCheckboxChecked: true //need to add backend data once endpoint exposed.
+      //   }
+      // }));
       setIsLoading(false);          
   
       //Check for migration Status and lock.
       // Status where Migration is to be Locked:
-      setIsMigrationLocked(projectData?.status === 2 || projectData?.status === 5);
+      setIsMigrationLocked(newMigrationData?.legacy_cms?.projectStatus === 2 || newMigrationData?.legacy_cms?.projectStatus  === 5);
     };
    
 
diff --git a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.scss b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.scss
index c185de9c1..5b35591e5 100644
--- a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.scss
+++ b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.scss
@@ -126,4 +126,7 @@
   font-size:medium; 
   padding: 10px 5px 0 0 !important; 
   padding-left: .25em;
+}
+.FieldLabel__required-text{
+  margin-left: -10px;
 }
\ No newline at end of file
diff --git a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
index 7c524f3f7..d69e858c9 100644
--- a/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
+++ b/ui/src/components/Stepper/VerticalStepper/AutoVerticalStepper.tsx
@@ -84,7 +84,7 @@ const AutoVerticalStepper = React.forwardRef<
             <div>
               <div className='orgWrapper'>
                 <Heading className='stepper-title' tagName='h3' text={data.title} />
-                {data?.isRequired && <span className="asterisk_input">(required)</span>  }    
+                {isRequired && <span className="FieldLabel__required-text">(required)</span>  }    
                 {data?.ifReadonly && <span>(read only)</span>}
               </div>
               <span className="stepper-titleNote">{data.titleNote ? data.titleNote : ''}</span>
diff --git a/ui/src/context/app/app.interface.ts b/ui/src/context/app/app.interface.ts
index 749bbbf3a..8bfb62830 100644
--- a/ui/src/context/app/app.interface.ts
+++ b/ui/src/context/app/app.interface.ts
@@ -158,7 +158,8 @@ export interface ILegacyCms {
   affix: string;
   isRestictedKeywordCheckboxChecked: boolean;
   isFileFormatCheckboxChecked: boolean;
-  currentStep:number
+  currentStep:number,
+  projectStatus:number,
 }
 export interface IDestinationStack {
   selectedOrg: IDropDown;
@@ -290,6 +291,7 @@ export const DEFAULT_LEGACY_CMS: ILegacyCms = {
   isRestictedKeywordCheckboxChecked: false,
   isFileFormatCheckboxChecked: false,
   currentStep:-1,
+  projectStatus:0
 };
 
 export const DEFAULT_DESTINATION_STACK: IDestinationStack = {
diff --git a/ui/src/pages/Migration/index.tsx b/ui/src/pages/Migration/index.tsx
index 96e356d79..e3fbf1201 100644
--- a/ui/src/pages/Migration/index.tsx
+++ b/ui/src/pages/Migration/index.tsx
@@ -37,6 +37,13 @@ import TestMigration from '../../components/TestMigration';
 import MigrationExecution from '../../components/MigrationExecution';
 import { Notification } from '@contentstack/venus-components';
 import { createObject } from '../../utilities/projectDBMapper';
+
+import { ICMSType, ILegacyCMSComponent } from "../../context/app/app.interface";
+import { DEFAULT_CMS_TYPE } from "../../context/app/app.interface";
+import { ICardType } from "../../components/Common/Card/card.interface";
+import { defaultCardType } from "../../components/Common/Card/card.interface";
+
+
 type StepperComponentRef = {
   handleStepChange: (step: number) => void;
 };
@@ -107,7 +114,69 @@ const Migration = () => {
       setProjectData(data?.data);
       setIsLoading(false);
     }
-    dispatch(updateNewMigrationData(createObject(data?.data)));
+  
+  const projectData = data?.data;
+
+  const legacyCmsData:ILegacyCMSComponent = await  getCMSDataFromFile(CS_ENTRIES.LEGACY_CMS);
+
+  const selectedCmsData: ICMSType = validateArray(legacyCmsData?.all_cms)
+  ? legacyCmsData?.all_cms?.find((cms: ICMSType) => cms?.cms_id === projectData?.legacy_cms?.cms) ?? DEFAULT_CMS_TYPE
+  : DEFAULT_CMS_TYPE;
+
+  const selectedFileFormatData: ICardType | undefined = validateArray(
+    selectedCmsData?.allowed_file_formats
+  )
+    ? selectedCmsData.allowed_file_formats?.find(
+        (cms: ICardType) => cms?.fileformat_id === projectData?.legacy_cms?.file_format
+      )
+    : defaultCardType;
+
+    const projectMapper = {
+      ...newMigrationData,
+        legacy_cms: {
+          selectedCms: selectedCmsData,
+          selectedFileFormat: selectedFileFormatData,
+          affix: projectData?.legacy_cms?.affix,
+          uploadedFile: {
+            file_details: {
+              localPath: projectData?.legacy_cms?.file_path,
+              awsData: {
+                awsRegion: projectData?.legacy_cms?.awsDetails?.awsRegion,
+                bucketName: projectData?.legacy_cms?.awsDetails?.bucketName,
+                buketKey: projectData?.legacy_cms?.awsDetails?.buketKey
+              },
+              isLocalPath: projectData?.legacy_cms?.is_localPath
+            },
+            isValidated: projectData?.legacy_cms?.is_fileValid || newMigrationData?.legacy_cms?.uploadedFile?.isValidated
+          },
+          isFileFormatCheckboxChecked: true, 
+          isRestictedKeywordCheckboxChecked: true,
+          projectStatus: projectData?.status
+        },
+        destination_stack: {
+          selectedOrg: {
+            value: projectData?.org_id,
+            label: projectData?.org_name
+          },
+          selectedStack: {
+            value: projectData?.destination_stack_id,
+            label: projectData?.destination_stack_name,
+            master_locale: projectData?.destination_stack_master_locale
+          },
+          stackArray:{
+            value: projectData?.destination_stack_id,
+            label: projectData?.destination_stack_name,
+            master_locale: projectData?.destination_stack_master_locale,
+            created_at: projectData?.destination_stack_created_at,
+          }
+        },
+        content_mapping: {
+          isDropDownChanged: false
+        },
+        stackDetails: projectData?.stackDetails,
+        mapper_keys: projectData?.mapper_keys,
+      };
+    dispatch(updateNewMigrationData(projectMapper));
   };
 
 
@@ -120,7 +189,6 @@ const Migration = () => {
         data: <LegacyCms
               ref={legacyCMSRef}
               legacyCMSData={projectData?.legacy_cms}
-              projectData={projectData}
               handleStepChange={handleStepChange}
               isCompleted={isCompleted}
               handleOnAllStepsComplete={handleOnAllStepsComplete}/>,
diff --git a/ui/src/utilities/projectDBMapper.ts b/ui/src/utilities/projectDBMapper.ts
index 63d1bfaec..07c91155a 100644
--- a/ui/src/utilities/projectDBMapper.ts
+++ b/ui/src/utilities/projectDBMapper.ts
@@ -41,6 +41,7 @@ export function createObject(projectData: any) {
           isDropDownChanged: false
         },
         stackDetails: projectData?.stackDetails,
+        mapper_keys: projectData?.mapper_keys,
       };
 
     return object;