diff --git a/ui/src/cmsData/legacyCms.json b/ui/src/cmsData/legacyCms.json
index 85f1c00e9..ad07c4b3c 100644
--- a/ui/src/cmsData/legacyCms.json
+++ b/ui/src/cmsData/legacyCms.json
@@ -269,4 +269,4 @@
   "restricted_keyword_checkbox_text": "Please acknowledge that you have referred to the Contentstack restricted keywords",
   "affix_cta": "Continue",
   "file_format_cta": "Continue"
-}
\ No newline at end of file
+}
diff --git a/ui/src/components/AdvancePropertise/index.tsx b/ui/src/components/AdvancePropertise/index.tsx
index 1b60299b4..87dd78ec7 100644
--- a/ui/src/components/AdvancePropertise/index.tsx
+++ b/ui/src/components/AdvancePropertise/index.tsx
@@ -1,9 +1,6 @@
 import {
   ModalBody,
-  ModalFooter,
   ModalHeader,
-  Button,
-  ButtonGroup,
   FieldLabel,
   TextInput,
   ToggleSwitch
@@ -13,6 +10,8 @@ import './index.scss';
 
 export interface SchemaProps {
   fieldtype: string;
+  value: any;
+  rowId: string;
   closeModal: () => void;
 }
 const AdvancePropertise = (props: SchemaProps) => {
@@ -33,24 +32,36 @@ const AdvancePropertise = (props: SchemaProps) => {
           Options
         </FieldLabel>
         <div className="options-class">
-          <ToggleSwitch label="Mandatory" labelColor="primary" labelPosition="right" />
-          <ToggleSwitch label="Multiple" labelColor="primary" labelPosition="right" />
-          <ToggleSwitch label="Unique" labelColor="primary" labelPosition="right" />
-          <ToggleSwitch label="Non-localizable" labelColor="primary" labelPosition="right" />
+          <ToggleSwitch
+            label="Mandatory"
+            labelColor="primary"
+            labelPosition="right"
+            checked={props?.value?.mandatory}
+          />
+          <ToggleSwitch
+            label="Multiple"
+            labelColor="primary"
+            labelPosition="right"
+            checked={props?.value?.multiple}
+          />
+          <ToggleSwitch
+            label="Unique"
+            labelColor="primary"
+            labelPosition="right"
+            checked={props?.value?.unique}
+          />
+          <ToggleSwitch
+            label="Non-localizable"
+            labelColor="primary"
+            labelPosition="right"
+            checked={props?.value?.non_localizable}
+          />
           <p className="non-localizable-message">
             If enabled, editing this field is restricted in localized entries. The field will use
             the value of the master-language entry in all localized entries.
           </p>
         </div>
       </ModalBody>
-      {/* <ModalFooter>
-            <ButtonGroup>
-              <Button buttonType="light" onClick={() => props.closeModal()}>
-                Cancel
-              </Button>
-              <Button>Save and proceed</Button>
-            </ButtonGroup>
-          </ModalFooter> */}
     </>
   );
 };
diff --git a/ui/src/components/Card/card.scss b/ui/src/components/Card/card.scss
index 39baf969b..a1f21cbe2 100644
--- a/ui/src/components/Card/card.scss
+++ b/ui/src/components/Card/card.scss
@@ -68,8 +68,8 @@
 }
 .ProjectCard__modified-date {
   color: $color-font-base;
-  display:block;
-  font-size:$size-font-small;
+  display: block;
+  font-size: $size-font-small;
   font-weight: $font-weight-regular;
   line-height: $line-height-reset;
   padding-left: 8px;
diff --git a/ui/src/components/Card/index.tsx b/ui/src/components/Card/index.tsx
index 7ff8700f5..07a7a9276 100644
--- a/ui/src/components/Card/index.tsx
+++ b/ui/src/components/Card/index.tsx
@@ -19,19 +19,17 @@ const CardList = ({ project }: ProjectType) => {
     if (isEmptyString(id)) return;
     navigate(`/projects/${id}/migration/steps/1`);
   };
-
   useEffect(() => {
     const fetchProject = async () => {
-      const { data, status } = await getProject(
-        selectedOrganisation?.value || '',
-        project?.id || ''
-      );
-      if (data?.legacy_cms && status === 200) {
-        setprojectDetails(data?.legacy_cms?.cms);
+      if (selectedOrganisation?.value && project?.id) {
+        const { data, status } = await getProject(selectedOrganisation?.value, project?.id);
+        if (status === 200 && data?.legacy_cms) {
+          setprojectDetails(data?.legacy_cms.cms);
+        }
       }
     };
     fetchProject();
-  }, [projectDetails]);
+  }, [selectedOrganisation?.value, project?.id]);
 
   return (
     <div style={{ padding: '0 20px 20px 0' }}>
diff --git a/ui/src/components/Common/Settings/Settings.scss b/ui/src/components/Common/Settings/Settings.scss
index dda7f602d..cfb8d60e0 100644
--- a/ui/src/components/Common/Settings/Settings.scss
+++ b/ui/src/components/Common/Settings/Settings.scss
@@ -13,7 +13,7 @@
   .PageLayout {
     width: 100%;
   }
-  .PageLayout__head  {
+  .PageLayout__head {
     border-left: 0 none;
   }
 }
diff --git a/ui/src/components/ContentMapper/contentMapper.interface.ts b/ui/src/components/ContentMapper/contentMapper.interface.ts
index 0a85ad55f..02e05cf29 100644
--- a/ui/src/components/ContentMapper/contentMapper.interface.ts
+++ b/ui/src/components/ContentMapper/contentMapper.interface.ts
@@ -93,6 +93,10 @@ export interface ContentTypeList {
 
 export interface optionsType {
   label?: string;
-  value?: string;
+  value?: object;
   isDisabled?: boolean;
 }
+
+export interface ExstingContentTypeMatch {
+  [key: string]: string;
+}
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index 554d2fcd7..73aaf204e 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -81,10 +81,19 @@ const Fields: Mapping = {
   CheckBox: 'Select'
 };
 
+interface ContentTypeMap {
+  [key: string]: string;
+}
+
 const ContentMapper = () => {
   /** ALL CONTEXT HERE */
-  const { migrationData, updateMigrationData, newMigrationData, updateNewMigrationData } =
-    useContext(AppContext);
+  const {
+    migrationData,
+    updateMigrationData,
+    newMigrationData,
+    updateNewMigrationData,
+    selectedOrganisation
+  } = useContext(AppContext);
 
   const {
     contentMappingData: {
@@ -112,10 +121,20 @@ const ContentMapper = () => {
   const [contentTypesList, setContentTypesList] = useState<ContentTypeList[]>([]);
   const [IsEmptyStack, setIsEmptyStack] = useState(false);
   const [selectedContentType, setSelectedContentType] = useState<ContentType>();
-  const [OtherContentType, setOtherContentType] = useState<FieldTypes>();
   const [exstingField, setexsitingField] = useState<ExistingFieldType>({});
   const [selectedOptions, setSelectedOptions] = useState<string[]>([]);
   const [isButtonLoading, setisButtonLoading] = useState(false);
+  const [isDropDownChanged, setisDropDownCHanged] = useState<boolean>(false);
+  const [contentTypeMapped, setcontentTypeMapped] = useState<ContentTypeMap>(
+    newMigrationData?.content_mapping?.content_type_mapping || {}
+  );
+  const [OtherContentType, setOtherContentType] = useState<FieldTypes>({
+    label: contentTypeMapped?.[otherCmsTitle],
+    value: contentTypeMapped?.[otherCmsTitle]
+  });
+  const [otherCmsUid, setotherCmsUid] = useState<string>(contentTypes[0]?.otherCmsUid);
+  const [isContentTypeMapped, setisContentTypeMapped] = useState<boolean>(false);
+  const [isContentTypeSaved, setisContentTypeSaved] = useState<boolean>(false);
 
   const [active, setActive] = useState<number>(null ?? 0);
 
@@ -149,6 +168,30 @@ const ContentMapper = () => {
     });
   }, []);
 
+  useEffect(() => {
+    if (contentTypeMapped && otherCmsTitle) {
+      setOtherContentType({
+        label: contentTypeMapped?.[otherCmsTitle] ?? 'Select Content Type',
+        value: contentTypeMapped?.[otherCmsTitle] ?? 'Select Content Type'
+      });
+    }
+  }, [contentTypeMapped, otherCmsTitle]);
+
+  useEffect(() => {
+    const updatedExstingField: any = {};
+    if (isContentTypeSaved) {
+      tableData?.forEach((row) => {
+        if (row?.contentstackField) {
+          updatedExstingField[row?.uid] = {
+            label: row?.contentstackField,
+            value: row?.contentstackField
+          };
+        }
+      });
+      setexsitingField(updatedExstingField);
+    }
+  }, [tableData, isContentTypeSaved]);
+
   // Method to fetch content types
   const fetchContentTypes = async (searchText: string) => {
     const { data } = await getContentTypes(projectId || '', 0, 10, ''); //org id will always present
@@ -158,6 +201,7 @@ const ContentMapper = () => {
     setTotalCounts(data?.contentTypes?.[0]?.fieldMapping?.length);
     setOtherCmsTitle(data?.contentTypes?.[0]?.otherCmsTitle);
     setContentTypeUid(data?.contentTypes?.[0]?.id);
+    setotherCmsUid(data?.contentTypes?.[0]?.otherCmsUid);
     fetchFields(data?.contentTypes?.[0]?.id, searchText);
   };
   const stackStatus = async () => {
@@ -248,9 +292,17 @@ const ContentMapper = () => {
   // Method to change the content type
   const openContentType = (e: React.MouseEvent<HTMLElement>, i: number) => {
     setActive(i);
-    setOtherCmsTitle(contentTypes?.[i]?.otherCmsTitle);
+
+    const otherTitle = contentTypes?.[i]?.otherCmsTitle;
+    setOtherCmsTitle(otherTitle);
+    const option = contentTypeMapped?.[otherTitle] ?? 'Select Content Type';
+    setOtherContentType({ label: option, value: option });
+
     setContentTypeUid(contentTypes?.[i]?.id);
     setCurrentIndex(i);
+    setotherCmsUid(contentTypes?.[i]?.otherCmsUid);
+    setSelectedContentType(contentTypes?.[i]);
+
     fetchFields(contentTypes?.[i]?.id, searchText);
   };
 
@@ -313,27 +365,29 @@ const ContentMapper = () => {
   const accessorCall = (data: FieldMapType) => {
     return (
       <div>
-        <div className='cms-field'>{data?.otherCmsField}</div>
+        <div className="cms-field">{data?.otherCmsField}</div>
         <InstructionText>
-          Other CMS Type: {data?.otherCmsType}<br />
-          UID: {data?.uid} 
+          Other CMS Type: {data?.otherCmsType}
+          <br />
+          UID: {data?.uid}
         </InstructionText>
       </div>
-    )
+    );
   };
   interface UidMap {
     [key: string]: boolean;
   }
   const rowIds = tableData.reduce<UidMap>((acc, item) => {
-    acc[item.id] = true;
+    acc[item?.id] = true;
     return acc;
   }, {});
 
   // Method for change select value
   const handleValueChange = (value: FieldTypes, rowIndex: string) => {
+    setisDropDownCHanged(true);
     setFieldValue(value);
-    const updatedRows = tableData.map((row) => {
-      if (row.uid === rowIndex) {
+    const updatedRows = tableData?.map((row) => {
+      if (row?.uid === rowIndex) {
         return { ...row, ContentstackFieldType: value?.value };
       }
       return row;
@@ -344,12 +398,22 @@ const ContentMapper = () => {
   const handleDropDownChange = (value: FieldTypes) => {
     setOtherContentType(value);
     // fetchFields(contentTypes?.[i]?.id, searchText);
-    
   };
 
-  const handleAdvancedSetting = (fieldtype: string) => {
+  const handleAdvancedSetting = (
+    fieldtype: string,
+    fieldvalue: ExistingFieldType,
+    rowId: string
+  ) => {
     return cbModal({
-      component: (props: ModalObj) => <AdvanceSettings fieldtype={fieldtype} {...props} />,
+      component: (props: ModalObj) => (
+        <AdvanceSettings
+          rowId={rowId}
+          value={fieldvalue?.[rowId]?.value}
+          fieldtype={fieldtype}
+          {...props}
+        />
+      ),
       modalProps: {
         shouldCloseOnOverlayClick: true
       }
@@ -407,25 +471,30 @@ const ContentMapper = () => {
           version="v2"
           icon="Setting"
           size="small"
-          onClick={() => handleAdvancedSetting(data?.ContentstackFieldType)}
+          onClick={() =>
+            handleAdvancedSetting(data?.ContentstackFieldType, exstingField, data?.uid)
+          }
         />
       </div>
     );
   };
 
   const handleFieldChange = (selectedValue: FieldTypes, rowIndex: string) => {
+    setisDropDownCHanged(true);
     setexsitingField((prevOptions) => ({
       ...prevOptions,
       [rowIndex]: { label: selectedValue?.label, value: selectedValue?.value }
     }));
 
-    setSelectedOptions((prevSelected) => {
-      const newValue = selectedValue?.label;
-      return prevSelected.includes(newValue) ? prevSelected : [...prevSelected, newValue];
-    });
+    if (isDropDownChanged && isContentTypeSaved) {
+      setSelectedOptions((prevSelected) => {
+        const newValue = selectedValue?.label;
+        return prevSelected?.includes(newValue) ? prevSelected : [...prevSelected, newValue];
+      });
+    }
 
     const updatedRows = tableData.map((row) => {
-      if (row.uid === rowIndex) {
+      if (row?.uid === rowIndex) {
         return { ...row, contentstackField: selectedValue?.label };
       }
       return row;
@@ -472,53 +541,53 @@ const ContentMapper = () => {
               !value?.field_metadata?.allow_rich_text &&
               !value?.field_metadata?.markdown
             ) {
-              OptionsForRow.push({ label: value?.display_name, value: key, isDisabled: false });
+              OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
             }
             break;
           case 'multiline':
             if (value?.field_metadata?.multiline === true) {
-              OptionsForRow.push({ label: value?.display_name, value: key, isDisabled: false });
+              OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
             }
             break;
           case 'url':
             if (value?.uid === 'url') {
-              OptionsForRow.push({ label: value?.display_name, value: key, isDisabled: false });
+              OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
             }
             break;
           case 'file':
             if (value?.data_type === 'file') {
-              OptionsForRow.push({ label: value?.display_name, value: key, isDisabled: false });
+              OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
             }
             break;
           case 'number':
             if (value?.data_type === 'number' && !value?.enum) {
-              OptionsForRow.push({ label: value?.display_name, value: key, isDisabled: false });
+              OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
             }
             break;
           case 'isodate':
             if (value?.data_type === 'isodate') {
-              OptionsForRow.push({ label: value?.display_name, value: key, isDisabled: false });
+              OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
             }
             break;
           case 'json':
             if (value?.data_type === 'json') {
-              OptionsForRow.push({ label: value?.display_name, value: key, isDisabled: false });
+              OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
             }
             break;
           case 'enum':
             if ('enum' in value) {
-              OptionsForRow.push({ label: value?.display_name, value: key, isDisabled: false });
+              OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
             }
             break;
           case 'allow_rich_text':
             if (value?.field_metadata?.allow_rich_text === true) {
-              OptionsForRow.push({ label: value?.display_name, value: key, isDisabled: false });
+              OptionsForRow.push({ label: value?.display_name, value: value, isDisabled: false });
             }
             break;
           default:
             OptionsForRow.push({
               label: 'No matches found',
-              value: 'No matches found',
+              value: { 'No matches found': '' },
               isDisabled: false
             });
             break;
@@ -539,38 +608,76 @@ const ContentMapper = () => {
     }));
 
     return (
-      <div className="select">
-        <Select
-          value={exstingField[data?.uid] || OptionValue}
-          onChange={(selectedOption: FieldTypes) => handleFieldChange(selectedOption, data?.uid)}
-          placeholder="Select Field"
-          version={'v2'}
-          maxWidth="290px"
-          isClearable={false}
-          options={adjustedOptions}
+      <div className="table-row">
+        <div className="select">
+          <Select
+            value={exstingField[data?.uid] || OptionValue}
+            onChange={(selectedOption: FieldTypes) => handleFieldChange(selectedOption, data?.uid)}
+            placeholder="Select Field"
+            version={'v2'}
+            maxWidth="290px"
+            isClearable={false}
+            options={adjustedOptions}
+          />
+        </div>
+        <Icon
+          version="v2"
+          icon="Setting"
+          size="small"
+          onClick={() =>
+            handleAdvancedSetting(data?.ContentstackFieldType, exstingField, data?.uid)
+          }
         />
       </div>
     );
   };
+
   const handleSaveContentType = async () => {
-    const orgId = newMigrationData?.destination_stack?.selectedOrg?.uid;
+    const orgId = selectedOrganisation?.uid;
     const projectID = projectId;
 
+    if (
+      selectedContentType &&
+      OtherContentType &&
+      selectedContentType?.otherCmsUid &&
+      OtherContentType?.label
+    ) {
+      setcontentTypeMapped((prevSelected) => ({
+        ...prevSelected,
+        [otherCmsTitle]: OtherContentType?.label
+      }));
+
+      const newMigrationDataObj: INewMigration = {
+        ...newMigrationData,
+        content_mapping: {
+          content_type_mapping: contentTypeMapped
+        }
+      };
+
+      updateNewMigrationData(newMigrationDataObj);
+    }
+
     if (orgId && contentTypeUid && selectedContentType) {
       const dataCs = {
         contentTypeData: {
-          id: selectedContentType?.id,
-          otherCmsTitle: 'Blog',
-          otherCmsUid: 'blog',
+          id: contentTypeUid,
+          otherCmsTitle: otherCmsTitle,
+          otherCmsUid: otherCmsUid,
           isUpdated: true,
           updateAt: new Date(),
-          contentstackTitle: contentTypeUid,
-          contentstackUid: contentTypeUid,
+          contentstackTitle: selectedContentType?.contentstackTitle,
+          contentstackUid: selectedContentType?.contnetStackUid,
           fieldMapping: tableData
         }
       };
 
-      const { status } = await updateContentType(orgId, projectID, selectedContentType.id, dataCs);
+      const { data, status } = await updateContentType(
+        orgId,
+        projectID,
+        selectedContentType.id,
+        dataCs
+      );
+
       if (status == 200) {
         Notification({
           notificationContent: { text: 'Content type saved successfully' },
@@ -580,6 +687,18 @@ const ContentMapper = () => {
           },
           type: 'success'
         });
+        setisDropDownCHanged(false);
+        setisContentTypeMapped(true);
+        setisContentTypeSaved(true);
+      } else {
+        Notification({
+          notificationContent: { text: data?.error?.message },
+          notificationProps: {
+            position: 'bottom-center',
+            hideProgressBar: false
+          },
+          type: 'error'
+        });
       }
     }
   };
@@ -587,6 +706,7 @@ const ContentMapper = () => {
   const handleResetContentType = async () => {
     const orgId = newMigrationData?.destination_stack?.selectedOrg?.uid;
     const projectID = projectId;
+    setisDropDownCHanged(false);
 
     const updatedRows = tableData.map((row) => {
       return { ...row, ContentstackFieldType: row.backupFieldType };
@@ -595,12 +715,12 @@ const ContentMapper = () => {
     const dataCs = {
       contentTypeData: {
         id: selectedContentType?.id,
-        otherCmsTitle: 'Blog',
-        otherCmsUid: 'blog',
+        otherCmsTitle: otherCmsTitle,
+        otherCmsUid: selectedContentType?.otherCmsUid,
         isUpdated: true,
         updateAt: new Date(),
-        contentstackTitle: contentTypeUid,
-        contentstackUid: contentTypeUid,
+        contentstackTitle: selectedContentType?.contentstackTitle,
+        contentstackUid: selectedContentType?.contnetStackUid,
         fieldMapping: updatedRows
       }
     };
@@ -647,9 +767,7 @@ const ContentMapper = () => {
   } else {
     columns?.push({
       disableSortBy: true,
-      Header: `Contentstack: ${
-        IsEmptyStack ? otherCmsTitle : OtherContentType?.label ?? ''
-      }`,
+      Header: `Contentstack: ${IsEmptyStack ? otherCmsTitle : OtherContentType?.label ?? ''}`,
       accessor: SelectAccessor,
       id: 'contentstack_cms_field',
       default: false
@@ -662,7 +780,13 @@ const ContentMapper = () => {
 
   const options = contentTypesList?.map((item) => ({
     label: item?.title,
-    value: item?.title
+    value: item?.title,
+    isDisabled: false
+  }));
+
+  const adjustedOption = options.map((option: any) => ({
+    ...option,
+    isDisabled: contentTypeMapped && Object.values(contentTypeMapped).includes(option?.label)
   }));
 
   const [SelectedAssets, updateSelectedAssets] = useState({});
@@ -672,10 +796,10 @@ const ContentMapper = () => {
     {
       label: 'Log selected Items',
       cb: (data: any) => {
-        updateResetRowSelection(true)
+        updateResetRowSelection(true);
       }
     }
-  ]
+  ];
 
   return (
     <div className="step-container">
@@ -734,10 +858,10 @@ const ContentMapper = () => {
               <Select
                 value={OtherContentType}
                 onChange={handleDropDownChange}
-                options={options}
+                options={adjustedOption}
                 width="345px"
                 maxWidth="345px"
-                placeholder="Select Contentstack Content Type"
+                placeholder={OtherContentType && 'Select Contentstack Content Type'}
                 version="v2"
               />
             </div>
@@ -755,12 +879,17 @@ const ContentMapper = () => {
               totalCounts={totalCounts}
               searchPlaceholder={searchPlaceholder}
               fetchTableData={fetchData}
+              rowDisableProp={{
+                key: '_invalid',
+                value: true
+              }}
               loadMoreItems={loadMoreItems}
               tableHeight={485}
               equalWidthColumns={true}
               columnSelector={false}
               initialRowSelectedData={tableData}
               initialSelectedRowIds={rowIds}
+              itemSize={90}
               withExportCta={{
                 component: (
                   <div style={{ display: 'flex', gap: '10px' }}>
@@ -850,6 +979,7 @@ const ContentMapper = () => {
           <Button
             buttonType={cta?.theme}
             isLoading={isButtonLoading}
+            disabled={isDropDownChanged}
             onClick={handleValidateOnClick}
           >
             {cta?.title}
diff --git a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
index 56fe4fa56..4d924ce34 100644
--- a/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadPrefix.tsx
@@ -103,8 +103,6 @@ const LoadPreFix = (props: LoadSelectCmsProps) => {
     setIsCheckedBoxChecked(checked);
   };
 
-
-
   /****  ALL USEEffects  HERE  ****/
 
   const { restricted_keyword_link = DEFAULT_URL_TYPE, restricted_keyword_checkbox_text = '' } =
diff --git a/ui/src/components/LegacyCms/Actions/LoadSelectCms.tsx b/ui/src/components/LegacyCms/Actions/LoadSelectCms.tsx
index 48fa0877d..98a702337 100644
--- a/ui/src/components/LegacyCms/Actions/LoadSelectCms.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadSelectCms.tsx
@@ -89,16 +89,16 @@ const LoadSelectCms = (props: LoadSelectCmsProps) => {
     updateCMSFilters(cmsFilter);
   };
 
-  const getCmsType = async() => {
-    const res:any = await fileValidation();
+  const getCmsType = async () => {
+    const res: any = await fileValidation();
     const cmsType = res?.data?.file_details?.cmsType;
     return cmsType;
-  }
+  };
   // Filter CMS Data
   const filterCMSData = async (searchText: string) => {
     const { all_cms = [] } = migrationData?.legacyCMSData || {};
-    const cmsType = await getCmsType(); // Fetch the specific CMS type 
-  
+    const cmsType = await getCmsType(); // Fetch the specific CMS type
+
     let filteredCmsData: ICMSType[] = [];
     if (isEmptyString(searchText) && !validateArray(cmsFilter) && !cmsType) {
       filteredCmsData = all_cms;
@@ -106,25 +106,29 @@ const LoadSelectCms = (props: LoadSelectCmsProps) => {
       if (cmsType) {
         filteredCmsData = all_cms?.filter((cms: ICMSType) => cms?.cms_id === cmsType);
       }
-  
+
       if (validateArray(cmsFilter) || !isEmptyString(searchText)) {
         const searchTextLower = searchText?.toLowerCase();
         filteredCmsData = all_cms
           .filter(({ parent }: ICMSType) => !cmsFilter?.length || cmsFilter?.includes(parent))
-          .filter(({ title, cms_id }: ICMSType) =>
-            title?.toLowerCase()?.includes(searchTextLower) ||
-            cms_id?.toLowerCase()?.includes(searchTextLower)
+          .filter(
+            ({ title, cms_id }: ICMSType) =>
+              title?.toLowerCase()?.includes(searchTextLower) ||
+              cms_id?.toLowerCase()?.includes(searchTextLower)
           );
       }
     }
-  
+
     setCmsData(filteredCmsData); // Set filtered CMS data
-  
+
     // Determine if a new card should be selected
-    const newSelectedCard = filteredCmsData?.find(cms => cms?.cms_id === selectedCard?.cms_id) || filteredCmsData[0] || null;
-    
+    const newSelectedCard =
+      filteredCmsData?.find((cms) => cms?.cms_id === selectedCard?.cms_id) ||
+      filteredCmsData[0] ||
+      null;
+
     if (newSelectedCard?.cms_id !== selectedCard?.cms_id) {
-      setSelectedCard(newSelectedCard); 
+      setSelectedCard(newSelectedCard);
 
       const newMigrationDataObj: INewMigration = {
         ...newMigrationData,
@@ -133,12 +137,14 @@ const LoadSelectCms = (props: LoadSelectCmsProps) => {
           selectedCms: newSelectedCard
         }
       };
-  
-      updateNewMigrationData(newMigrationDataObj); 
-  
+
+      updateNewMigrationData(newMigrationDataObj);
+
       // API call for saving selected CMS, if a new card is selected
       if (newSelectedCard) {
-        updateLegacyCMSData(selectedOrganisation?.value, projectId, { legacy_cms: newSelectedCard?.cms_id });
+        updateLegacyCMSData(selectedOrganisation?.value, projectId, {
+          legacy_cms: newSelectedCard?.cms_id
+        });
       }
     }
   };
diff --git a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
index 1f34a3257..1c2ede18a 100644
--- a/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
+++ b/ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
@@ -18,9 +18,8 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
   const { projectId = '' } = useParams();
 
   //Handle further action on file is uploaded to server
-  const handleOnFileUploadCompletion = async() => {
-
-    const res : any  = await fileValidation();
+  const handleOnFileUploadCompletion = async () => {
+    const res: any = await fileValidation();
 
     const newMigrationDataObj: INewMigration = {
       ...newMigrationData,
@@ -28,27 +27,25 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
         ...newMigrationData.legacy_cms,
         uploadedFile: {
           name: res?.data?.file_details?.localPath,
-          url : res?.data?.file_details?.localPath,
+          url: res?.data?.file_details?.localPath,
           validation: res?.data?.message,
-          isValidated: res?.data?.status== 200 ? true : false,
+          isValidated: res?.data?.status == 200 ? true : false,
           file_details: {
-            isLocalPath:res?.data?.file_details?.isLocalPath,
+            isLocalPath: res?.data?.file_details?.isLocalPath,
             cmsType: res?.data?.file_details?.cmsType,
             localPath: res?.data?.file_details?.localPath,
             awsData: {
               awsRegion: res?.data?.file_details?.awsData?.awsRegion,
-              bucketName:res?.data?.file_details?.awsData?.bucketName,
-              buketKey:res?.data?.file_details?.awsData?.buketKey,
+              bucketName: res?.data?.file_details?.awsData?.bucketName,
+              buketKey: res?.data?.file_details?.awsData?.buketKey
             }
-          }},
-        } 
+          }
+        }
       }
+    };
     updateNewMigrationData(newMigrationDataObj);
-    
-  
-     props.handleStepChange(props.currentStep, true);
 
-    
+    props.handleStepChange(props?.currentStep, true);
   };
 
   const allowedFileExtentions = `.${
@@ -56,7 +53,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
   }`;
   useEffect(() => {
     handleOnFileUploadCompletion();
-  },[newMigrationData]);
+  }, [newMigrationData]);
 
   return (
     <div className="row">
diff --git a/ui/src/components/LegacyCms/Summary/UploadFileSummary.tsx b/ui/src/components/LegacyCms/Summary/UploadFileSummary.tsx
index c044935ee..e671c98d0 100644
--- a/ui/src/components/LegacyCms/Summary/UploadFileSummary.tsx
+++ b/ui/src/components/LegacyCms/Summary/UploadFileSummary.tsx
@@ -15,9 +15,9 @@ interface Props {
   fileDetails: FileDetails;
 }
 
-const FileComponent : React.FC<Props>= ({fileDetails}) => {
+const FileComponent: React.FC<Props> = ({ fileDetails }) => {
   return (
-    <div className='col-11'>
+    <div className="col-11">
       <p className="summary-title">Is Local Path: {fileDetails?.isLocalPath ? 'Yes' : 'No'}</p>
       <p className="summary-title">CMS Type: {fileDetails?.cmsType}</p>
       <p className="summary-title">Local Path: {fileDetails?.localPath}</p>
@@ -26,43 +26,38 @@ const FileComponent : React.FC<Props>= ({fileDetails}) => {
       <p className="summary-title">Bucket Key: {fileDetails?.awsData?.buketKey}</p>
     </div>
   );
-
-
-}
+};
 
 const UploadFileSummary = ({
   stepComponentProps,
   stepData
 }: UploadFileSummaryProps): JSX.Element => {
   const { newMigrationData } = useContext(AppContext);
-  
 
   return (
     <div className="row bg-white">
-      {!isEmptyString(newMigrationData?.legacy_cms?.uploadedFile?.name) 
-      ? (       
-          <div className="col-11 ">
-            <FileComponent fileDetails={newMigrationData?.legacy_cms?.uploadedFile?.file_details}/>
-            <br></br> 
-            <span className="summary-title">{newMigrationData?.legacy_cms?.uploadedFile?.validation}</span>
+      {!isEmptyString(newMigrationData?.legacy_cms?.uploadedFile?.name) ? (
+        <div className="col-11 ">
+          <FileComponent fileDetails={newMigrationData?.legacy_cms?.uploadedFile?.file_details} />
+          <br></br>
+          <span className="summary-title">
+            {newMigrationData?.legacy_cms?.uploadedFile?.validation}
+          </span>
 
-            {!newMigrationData?.legacy_cms?.uploadedFile?.isValidated 
-            ? 
-            (<p className=' ValidationMessage__v2'>Please upload the correct file</p>) : 
-            (<></>)
-          }
-        
-          </div>
-         
-        
+          {!newMigrationData?.legacy_cms?.uploadedFile?.isValidated ? (
+            <p className="ValidationMessage__v2">Please upload the correct file</p>
+          ) : (
+            <></>
+          )}
+        </div>
       ) : (
         <div className="col-12 bg-white">
           <span className="summary-title">{stepData?.empty_step_placeholder}</span>
-          {!newMigrationData?.legacy_cms?.uploadedFile?.isValidated 
-            ? 
-            (<p className=' ValidationMessage__v2'>Please upload the correct file</p>) : 
-            (<></>)
-          }
+          {!newMigrationData?.legacy_cms?.uploadedFile?.isValidated ? (
+            <p className="ValidationMessage__v2">Please upload the correct file</p>
+          ) : (
+            <></>
+          )}
         </div>
       )}
     </div>
diff --git a/ui/src/components/LegacyCms/index.tsx b/ui/src/components/LegacyCms/index.tsx
index 5a95d995b..c6f3568ce 100644
--- a/ui/src/components/LegacyCms/index.tsx
+++ b/ui/src/components/LegacyCms/index.tsx
@@ -43,9 +43,9 @@ const LegacyCMSComponent = ({ legacyCMSData, projectData }: LegacyCMSComponentPr
   const [internalActiveStepIndex, setInternalActiveStepIndex] = useState<number>(-1);
   const [stepperKey, setStepperKey] = useState<string>('v-mig-step');
   const { projectId = '' } = useParams();
-  const [isValidated,setisValidated] = useState<boolean>(newMigrationData?.legacy_cms?.uploadedFile?.isValidated || false);
-
-  
+  const [isValidated, setisValidated] = useState<boolean>(
+    newMigrationData?.legacy_cms?.uploadedFile?.isValidated || false
+  );
 
   const navigate = useNavigate();
   const autoVerticalStepper = useRef<any>(null);
@@ -208,50 +208,49 @@ const LegacyCMSComponent = ({ legacyCMSData, projectData }: LegacyCMSComponentPr
 
   return (
     <>
-      {isLoading 
-        ? (
+      {isLoading ? (
+        <div className="row">
+          <div className="col-12 text-center center-align">
+            <CircularLoader />
+          </div>
+        </div>
+      ) : (
+        <div className="legacy-cms-container">
           <div className="row">
-            <div className="col-12 text-center center-align">
-              <CircularLoader />
+            <div className="col-12">
+              <AutoVerticalStepper
+                ref={autoVerticalStepper}
+                key={stepperKey}
+                steps={getLegacyCMSSteps(
+                  isCompleted,
+                  isMigrationLocked,
+                  migrationData?.legacyCMSData.all_steps
+                )}
+                isEdit={!isMigrationLocked}
+                handleOnAllStepsComplete={handleOnAllStepsComplete}
+                stepComponentProps={{
+                  handleDeleteFile: handleOnClickDeleteUploadedFile
+                }}
+              />
             </div>
-          </div>
-        ) 
-        : (
-          <div className="legacy-cms-container">
-            <div className="row">
+            {isCompleted && !isMigrationLocked ? (
               <div className="col-12">
-                <AutoVerticalStepper
-                  ref={autoVerticalStepper}
-                  key={stepperKey}
-                  steps={getLegacyCMSSteps(
-                    isCompleted,
-                    isMigrationLocked,
-                    migrationData.legacyCMSData.all_steps
-                  )}
-                  isEdit={!isMigrationLocked}
-                  handleOnAllStepsComplete={handleOnAllStepsComplete}
-                  stepComponentProps={{
-                    handleDeleteFile: handleOnClickDeleteUploadedFile
-                  }}
-                />
-              </div>
-              {isCompleted && !isMigrationLocked ? (
-                <div className="col-12">
-                  <div className="pl-40">
-                    <Button version="v2"
-                    disabled={! newMigrationData?.legacy_cms?.uploadedFile?.isValidated} 
-                    onClick={handleOnClick}>
-                      {migrationData?.legacyCMSData?.cta}
-                    </Button>
-                  </div>
+                <div className="pl-40">
+                  <Button
+                    version="v2"
+                    disabled={!newMigrationData?.legacy_cms?.uploadedFile?.isValidated}
+                    onClick={handleOnClick}
+                  >
+                    {migrationData?.legacyCMSData?.cta}
+                  </Button>
                 </div>
-              ) : (
-                <></>
-              )}
-            </div>
+              </div>
+            ) : (
+              <></>
+            )}
           </div>
-        )
-      }
+        </div>
+      )}
     </>
   );
 };
diff --git a/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.scss b/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.scss
index 11f38d647..db2d19a22 100644
--- a/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.scss
+++ b/ui/src/components/Migrations/NewMigration/NewMigrationWrapper.scss
@@ -72,7 +72,6 @@
     position: relative;
     padding: 0;
     width: auto;
-    height: calc(100vh - 7.25rem)!important;
+    height: calc(100vh - 7.25rem) !important;
   }
-} 
-
+}
diff --git a/ui/src/components/Modal/index.tsx b/ui/src/components/Modal/index.tsx
index a10b78ae7..7a064c133 100644
--- a/ui/src/components/Modal/index.tsx
+++ b/ui/src/components/Modal/index.tsx
@@ -141,10 +141,7 @@ const Modal = (props: ProjectModalProps) => {
                     {({ input, meta }): JSX.Element => {
                       return (
                         <>
-                          <FieldLabel
-                            htmlFor="description"
-                            version="v2"
-                          >
+                          <FieldLabel htmlFor="description" version="v2">
                             {description}
                           </FieldLabel>
                           <Textarea
diff --git a/ui/src/components/SchemaModal/index.tsx b/ui/src/components/SchemaModal/index.tsx
index bd37f99cc..843358574 100644
--- a/ui/src/components/SchemaModal/index.tsx
+++ b/ui/src/components/SchemaModal/index.tsx
@@ -1,10 +1,6 @@
 // Libraries
 import { useState, useEffect } from 'react';
-import {
-  ModalBody,
-  ModalHeader,
-  Icon,
-} from '@contentstack/venus-components';
+import { ModalBody, ModalHeader, Icon } from '@contentstack/venus-components';
 
 // Interface
 import { Icons, SchemaProps, schemaType } from './schemaModal.interface';
diff --git a/ui/src/context/app/app.interface.ts b/ui/src/context/app/app.interface.ts
index c7c6e37b8..919d5ef7e 100644
--- a/ui/src/context/app/app.interface.ts
+++ b/ui/src/context/app/app.interface.ts
@@ -11,6 +11,10 @@ export interface ICTA {
   href: string;
 }
 
+interface ContentTypeMap {
+  [key: string]: string;
+}
+
 export interface Organization {
   uid: string;
   name: string;
@@ -33,14 +37,14 @@ export interface User {
   organizations: Organization[];
 }
 export interface FileDetails {
-  isLocalPath:boolean;
+  isLocalPath: boolean;
   cmsType: string;
   localPath: string;
   awsData: {
-  awsRegion: string;
-  bucketName:string
-  buketKey:string
-  }
+    awsRegion: string;
+    bucketName: string;
+    buketKey: string;
+  };
 }
 export interface IFile {
   id?: string;
@@ -145,10 +149,14 @@ export interface IDestinationStack {
   selectedOrg: IDropDown;
   selectedStack: IDropDown;
 }
+export interface IContentMapper {
+  content_type_mapping: ContentTypeMap;
+}
 
 export interface INewMigration {
   legacy_cms: ILegacyCms;
   destination_stack: IDestinationStack;
+  content_mapping: IContentMapper;
   test_migration: ITestMigration;
 }
 
@@ -228,17 +236,17 @@ export const DEFAULT_FILE: IFile = {
   name: '',
   size: 0,
   type: '',
-  file_details:{
-    isLocalPath:false,
+  file_details: {
+    isLocalPath: false,
     cmsType: '',
     localPath: '',
     awsData: {
-    awsRegion: '',
-    bucketName:'',
-    buketKey:'',
-  },
+      awsRegion: '',
+      bucketName: '',
+      buketKey: ''
+    }
   },
-  isValidated:false
+  isValidated: false
 };
 
 export const DEFAULT_CMS_TYPE: ICMSType = {
@@ -267,6 +275,10 @@ export const DEFAULT_DESTINATION_STACK: IDestinationStack = {
   selectedStack: DEFAULT_DROPDOWN
 };
 
+export const DEFAULT_CONTENT_MAPPER: IContentMapper = {
+  content_type_mapping: {}
+};
+
 export const DEFAULT_TEST_MIGRATION: ITestMigration = {
   stack_link: ''
 };
@@ -274,6 +286,7 @@ export const DEFAULT_TEST_MIGRATION: ITestMigration = {
 export const DEFAULT_NEW_MIGRATION: INewMigration = {
   legacy_cms: DEFAULT_LEGACY_CMS,
   destination_stack: DEFAULT_DESTINATION_STACK,
+  content_mapping: DEFAULT_CONTENT_MAPPER,
   test_migration: DEFAULT_TEST_MIGRATION
 };
 
diff --git a/ui/src/pages/Login/index.tsx b/ui/src/pages/Login/index.tsx
index dd8abd536..e5d76e26f 100644
--- a/ui/src/pages/Login/index.tsx
+++ b/ui/src/pages/Login/index.tsx
@@ -15,7 +15,12 @@ import {
 import { Field as FinalField, Form as FinalForm } from 'react-final-form';
 
 // Utilities
-import { LOGIN_SUCCESSFUL_MESSAGE, TFA_MESSAGE, TFA_VIA_SMS_MESSAGE, CS_ENTRIES } from '../../utilities/constants';
+import {
+  LOGIN_SUCCESSFUL_MESSAGE,
+  TFA_MESSAGE,
+  TFA_VIA_SMS_MESSAGE,
+  CS_ENTRIES
+} from '../../utilities/constants';
 import {
   failtureNotification,
   clearMarks,
@@ -96,24 +101,24 @@ const Login: FC<IProps> = (props: any) => {
     };
 
     await requestSMSToken(userAuth?.user)
-    .then((res: UserRes) => {
-      if (res?.status === 200 && res?.data?.notice === TFA_VIA_SMS_MESSAGE) {
-        Notification({
-          notificationContent: { text: res?.data?.notice },
-          type: 'success'
-        });
-      }
-      
-      if (res?.message === LOGIN_SUCCESSFUL_MESSAGE) {
-        setLoginStates((prev) => ({ ...prev, submitted: true }));
-      }
+      .then((res: UserRes) => {
+        if (res?.status === 200 && res?.data?.notice === TFA_VIA_SMS_MESSAGE) {
+          Notification({
+            notificationContent: { text: res?.data?.notice },
+            type: 'success'
+          });
+        }
 
-      if (res?.status === 422) {
-        failtureNotification(res?.data?.error_message as string);
-      }
-    })
-    .catch((err: string) => console.error(err)); 
- };
+        if (res?.message === LOGIN_SUCCESSFUL_MESSAGE) {
+          setLoginStates((prev) => ({ ...prev, submitted: true }));
+        }
+
+        if (res?.status === 422) {
+          failtureNotification(res?.data?.error_message as string);
+        }
+      })
+      .catch((err: string) => console.error(err));
+  };
 
   // ************* Login submit ************
   const onSubmit = async (values: User) => {
@@ -136,7 +141,7 @@ const Login: FC<IProps> = (props: any) => {
             email: values?.email,
             password: values?.password
           }
-        }
+        };
       });
     }
 
@@ -301,12 +306,12 @@ const Login: FC<IProps> = (props: any) => {
                                   onChange={(event: React.ChangeEvent<HTMLInputElement>): void => {
                                     input.onChange(event);
                                     setLoginStates((prevState: IStates) => ({
-                                        ...prevState,
-                                        user: {
-                                          ...prevState.user,
-                                          email: event.target.value
-                                        }
-                                      }))
+                                      ...prevState,
+                                      user: {
+                                        ...prevState.user,
+                                        email: event.target.value
+                                      }
+                                    }));
                                   }}
                                   name="email"
                                   width="large"
@@ -351,12 +356,12 @@ const Login: FC<IProps> = (props: any) => {
                                   onChange={(event: React.ChangeEvent<HTMLInputElement>): void => {
                                     input.onChange(event);
                                     setLoginStates((prevState: IStates) => ({
-                                        ...prevState,
-                                        user: {
-                                          ...prevState.user,
-                                          password: event.target.value
-                                        }
-                                      }))
+                                      ...prevState,
+                                      user: {
+                                        ...prevState.user,
+                                        password: event.target.value
+                                      }
+                                    }));
                                   }}
                                   width="large"
                                   canShowPassword={true}
diff --git a/ui/src/pages/Projects/index.tsx b/ui/src/pages/Projects/index.tsx
index 3ffa3b276..213c3ed5d 100644
--- a/ui/src/pages/Projects/index.tsx
+++ b/ui/src/pages/Projects/index.tsx
@@ -1,12 +1,6 @@
 // Libraries
 import { useContext, useEffect, useState } from 'react';
-import {
-  PageLayout,
-  EmptyState,
-  Button,
-  Icon,
-  cbModal
-} from '@contentstack/venus-components';
+import { PageLayout, EmptyState, Button, Icon, cbModal } from '@contentstack/venus-components';
 import { jsonToHtml } from '@contentstack/json-rte-serializer';
 import HTMLReactParser from 'html-react-parser';
 import { useLocation } from 'react-router-dom';
@@ -64,11 +58,13 @@ const Projects = () => {
   const { selectedOrganisation } = useContext(AppContext);
 
   const fetchProjects = async () => {
-    const { data, status } = await getAllProjects(selectedOrganisation?.value); //org id will always present
-    if (status === 200) {
-      setLoadStatus(false);
-      setProjects(data);
-      setAllProjects(data);
+    if (selectedOrganisation?.value) {
+      const { data, status } = await getAllProjects(selectedOrganisation?.value || ''); //org id will always present
+      if (status === 200) {
+        setLoadStatus(false);
+        setProjects(data);
+        setAllProjects(data);
+      }
     }
   };
 
@@ -127,7 +123,9 @@ const Projects = () => {
     cbModal({
       component: (props: ModalObj) => (
         <Modal
-          modalData={createProjectModal && validateObject(createProjectModal) ? createProjectModal : {}}
+          modalData={
+            createProjectModal && validateObject(createProjectModal) ? createProjectModal : {}
+          }
           selectedOrg={selectedOrganisation}
           {...props}
         />
@@ -157,64 +155,57 @@ const Projects = () => {
   const content = {
     component: (
       <div className="flex-wrap w-100" key="project-component">
-        {loadStatus 
-          ? (
-            <div className="flex-wrap">
-              {[...Array(20)].map((e, i) => (
-                <CardList key={i} />
-              ))}
+        {loadStatus ? (
+          <div className="flex-wrap">
+            {[...Array(20)].map((e, i) => (
+              <CardList key={i} />
+            ))}
+          </div>
+        ) : projects && projects?.length > 0 ? (
+          projects?.map((e) => (
+            <div key={e?.uid}>
+              <CardList project={e} />
             </div>
-          ) 
-          : projects && projects?.length > 0 
-            ? (
-              projects?.map((e) => (
-                <div key={e?.uid}>
-                  <CardList project={e} />
-                </div>
-              ))
-            ) 
-            : projects && projects?.length > 0 && !searchText 
-              ? (
-                <EmptyState
-                  forPage="emptyStateV2"
-                  heading={<div className="empty_search_heading">{emptystate?.empty_search_heading}</div>}
-                  img={NO_PROJECTS_SEARCH}
-                  description={
-                    <div className="empty_search_description">
-                      {HTMLReactParser(jsonToHtml(emptystate?.empty_search_description ?? {}))}
-                    </div>
-                  }
-                  version="v2"
-                  className="no_results_found_page"
-                  testId="no-results-found-page"
-                />
-              ) 
-              : (
-                <EmptyState
-                  forPage="emptyStateV2"
-                  heading={emptystate?.heading}
-                  img={NO_PROJECTS}
-                  description={outputIntro}
-                  version="v2"
+          ))
+        ) : projects && projects?.length > 0 && !searchText ? (
+          <EmptyState
+            forPage="emptyStateV2"
+            heading={<div className="empty_search_heading">{emptystate?.empty_search_heading}</div>}
+            img={NO_PROJECTS_SEARCH}
+            description={
+              <div className="empty_search_description">
+                {HTMLReactParser(jsonToHtml(emptystate?.empty_search_description ?? {}))}
+              </div>
+            }
+            version="v2"
+            className="no_results_found_page"
+            testId="no-results-found-page"
+          />
+        ) : (
+          <EmptyState
+            forPage="emptyStateV2"
+            heading={emptystate?.heading}
+            img={NO_PROJECTS}
+            description={outputIntro}
+            version="v2"
+          >
+            {emptystate?.cta &&
+              emptystate?.cta?.length > 0 &&
+              emptystate?.cta?.map((cta: CTA, index: number) => (
+                <Button
+                  key={`${index.toString()}`}
+                  buttonType={cta?.theme}
+                  className="mt-10 no-project-add-btn"
+                  onClick={() => openModal()}
                 >
-                  {emptystate?.cta &&
-                    emptystate?.cta?.length > 0 &&
-                    emptystate?.cta?.map((cta: CTA, index: number) => (
-                      <Button
-                        key={`${index.toString()}`}
-                        buttonType={cta?.theme}
-                        className="mt-10 no-project-add-btn"
-                        onClick={() => openModal()}
-                      >
-                        {cta?.with_icon && (
-                          <Icon icon="Plus" version="v2" size="small" fill="white" stroke="white" />
-                        )}
-                        {cta?.title}
-                      </Button>
-                    ))}
-                  </EmptyState>
-                )
-        }
+                  {cta?.with_icon && (
+                    <Icon icon="Plus" version="v2" size="small" fill="white" stroke="white" />
+                  )}
+                  {cta?.title}
+                </Button>
+              ))}
+          </EmptyState>
+        )}
       </div>
     )
   };
diff --git a/ui/src/pages/RegionalLogin/index.tsx b/ui/src/pages/RegionalLogin/index.tsx
index ad41b173b..88edc52e7 100644
--- a/ui/src/pages/RegionalLogin/index.tsx
+++ b/ui/src/pages/RegionalLogin/index.tsx
@@ -59,9 +59,9 @@ const RegionalLogin = () => {
   const { description, heading, regions } = data;
 
   return (
-    <div className='d-flex vh-100 align-items-center justify-content-center flex-column'>
+    <div className="d-flex vh-100 align-items-center justify-content-center flex-column">
       <div className="container mx-auto">
-        <div className='text-center'>
+        <div className="text-center">
           {heading && <Heading tagName="h0" text={heading} className="pb-2" />}
           {description && description != '' && (
             <div className="textStone600 pt-3">{parse(description as string)}</div>
@@ -114,8 +114,6 @@ const RegionalLogin = () => {
           </div>
         </div>
       </div>
-    
-      
     </div>
   );
 };
diff --git a/ui/src/scss/App.scss b/ui/src/scss/App.scss
index e43bbf9ea..24a5a5dde 100644
--- a/ui/src/scss/App.scss
+++ b/ui/src/scss/App.scss
@@ -329,5 +329,5 @@ p {
     .PageLayout__head__hamburger {
       display: none;
     }
-  } 
-} 
+  }
+}
diff --git a/ui/src/services/api/upload.service.ts b/ui/src/services/api/upload.service.ts
index e3c67a9a7..35c4cdd7e 100644
--- a/ui/src/services/api/upload.service.ts
+++ b/ui/src/services/api/upload.service.ts
@@ -36,13 +36,10 @@ export const uploadFilePath = () => {
   return `${UPLOAD_FILE_RELATIVE_URL}upload`;
 };
 
-
 export const fileValidation = () => {
   try {
-    return getCall(`${UPLOAD_FILE_RELATIVE_URL}validator`)
-    
+    return getCall(`${UPLOAD_FILE_RELATIVE_URL}validator`);
   } catch (error) {
     return error;
-    
   }
-}
\ No newline at end of file
+};