diff --git a/api/src/services/migration.service.ts b/api/src/services/migration.service.ts
index 62c6a7d8b..6bfcd5f7b 100644
--- a/api/src/services/migration.service.ts
+++ b/api/src/services/migration.service.ts
@@ -695,7 +695,7 @@ const startMigration = async (req: Request): Promise<any> => {
         break;
       }
       case CMS.AEM: {
-        await aemService.createAssets({ projectId, packagePath, destinationStackId: project?.current_test_stack_id });
+        await aemService.createAssets({ projectId, packagePath, destinationStackId: project?.destination_stack_id });
         await aemService.createEntry({
           packagePath,
           contentTypes,
diff --git a/ui/src/components/ContentMapper/index.scss b/ui/src/components/ContentMapper/index.scss
index 97feac814..0e6433b29 100644
--- a/ui/src/components/ContentMapper/index.scss
+++ b/ui/src/components/ContentMapper/index.scss
@@ -425,4 +425,47 @@ div .table-row {
 .advanced-setting-button,
 .table-row button {
   flex-shrink: 0;           
+}
+
+// Prevent header wrapping
+.nowrap-header {
+  white-space: nowrap;
+  display: inline-block;
+}
+
+// Make sure table and save button stay fully visible
+.table-wrapper {
+  position: relative;
+  padding-bottom: 70px;
+}
+
+// Sticky footer for Save button
+.mapper-footer {
+  position: sticky;
+  bottom: 0;
+  background: #fff;
+  padding: 12px 18px;
+  border-top: 1px solid #e5e5e5;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  z-index: 100;
+}
+
+// Ensure Save button is never clipped
+.saveButton {
+  min-width: 90px;
+}
+
+// Prevent bottom overflow issues with InfiniteScrollTable
+.infinite-scroll-table,
+.infinite-scroll-table-wrapper {
+  overflow-y: auto !important;
+}
+
+// Safety for small screens 
+@media (max-height: 800px) {
+  .mapper-footer {
+    padding: 10px;
+  }
 }
\ No newline at end of file
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index be54bb0bc..044e54894 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -2381,10 +2381,12 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
   const columns = [
     {
       disableSortBy: true,
-      Header: `${newMigrationData?.legacy_cms?.selectedCms?.title}: ${otherCmsTitle}`,
+      Header: (
+        <span className="nowrap-header">
+          {`${newMigrationData?.legacy_cms?.selectedCms?.title}: ${otherCmsTitle}`}
+        </span>
+      ),
       accessor: accessorCall,
-      // accessor: 'otherCmsField',
-      default: false,
       id: 'uuid'
     }
   ];
@@ -2394,19 +2396,25 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
   if (!isNewStack) {
     columns?.push({
       disableSortBy: true,
-      Header: `Contentstack: ${isOtherContentType ? otherContentType?.label : otherCmsTitle}`,
+      Header: (
+        <span className="nowrap-header">
+          {`Contentstack: ${isOtherContentType ? otherContentType?.label : otherCmsTitle}`}
+        </span>
+      ),
       // accessor: 'ct_field',
       accessor: SelectAccessorOfColumn,
       id: 'contentstack_field',
-      default: false
     });
   } else {
     columns?.push({
       disableSortBy: true,
-      Header: `Contentstack: ${isNewStack ? otherCmsTitle : otherContentType?.label ?? ''}`,
+      Header: (
+        <span className="nowrap-header">
+          {`Contentstack: ${isNewStack ? otherCmsTitle : otherContentType?.label ?? ''}`}
+        </span>
+      ),
       accessor: SelectAccessor,
       id: 'contentstack_cms_field',
-      default: false
     });
   }
 
@@ -2680,7 +2688,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
                     plural: `${totalCounts === 0 ? 'Count' : ''}`
                   }}
                 />
-                <div className='d-flex align-items-center justify-content-between my-2 mx-3 px-1 py-1'>
+                <div className="mapper-footer">
                   <div>Total Fields: <strong>{totalCounts}</strong></div>
                   <Button
                     className="saveButton"