diff --git a/client/src/features/groupsV2/new/GroupNew.tsx b/client/src/features/groupsV2/new/GroupNew.tsx
index 10b69b5d9b..6ca83b8ad9 100644
--- a/client/src/features/groupsV2/new/GroupNew.tsx
+++ b/client/src/features/groupsV2/new/GroupNew.tsx
@@ -174,28 +174,30 @@ function GroupV2CreationDetails() {
         >
           <FormGroup className="d-inline" disabled={result.isLoading}>
             <div className={cx("d-flex", "flex-column", "gap-3")}>
-              <div className="mb-1">
-                <NameFormField
+              <div>
+                <div className="mb-1">
+                  <NameFormField
+                    control={control}
+                    entityName="group"
+                    errors={errors}
+                    name="name"
+                  />
+                </div>
+
+                <SlugPreviewFormField
+                  compact={true}
                   control={control}
-                  entityName="group"
                   errors={errors}
-                  name="name"
+                  name="slug"
+                  resetFunction={resetUrl}
+                  parentPath={parentPath}
+                  slug={currentSlug}
+                  dirtyFields={dirtyFields}
+                  label="Group URL"
+                  entityName="group"
                 />
               </div>
 
-              <SlugPreviewFormField
-                compact={true}
-                control={control}
-                errors={errors}
-                name="slug"
-                resetFunction={resetUrl}
-                parentPath={parentPath}
-                slug={currentSlug}
-                dirtyFields={dirtyFields}
-                label="Group URL"
-                entityName="group"
-              />
-
               <DescriptionFormField
                 control={control}
                 entityName="group"
diff --git a/client/src/features/project/components/projectMigration/ProjectMigrationDetails.tsx b/client/src/features/project/components/projectMigration/ProjectMigrationDetails.tsx
index 25e2c9c76b..bceb56ae23 100644
--- a/client/src/features/project/components/projectMigration/ProjectMigrationDetails.tsx
+++ b/client/src/features/project/components/projectMigration/ProjectMigrationDetails.tsx
@@ -92,7 +92,8 @@ export function DetailsMigration({
       <span>- Resource class:</span>
       {resourceClass ? (
         <>
-          <span>{resourceClass?.name} |</span>
+          <span>{resourceClass?.name}</span>
+          <span>|</span>
           <SessionRowResourceRequests resourceRequests={resourceClassData} />
         </>
       ) : (
@@ -102,7 +103,7 @@ export function DetailsMigration({
   );
 
   const detailsSession = (
-    <div className={cx("ps-4", "d-flex", "flex-column", "gap-2", "pb-2")}>
+    <div className={cx("ps-4", "d-flex", "flex-column", "gap-3")}>
       {isPinnedImage ? (
         <>
           <div>
@@ -133,18 +134,16 @@ export function DetailsMigration({
   );
 
   const containerImageInfoAlert = (
-    <div className="py-2">
-      <InfoAlert dismissible={false} timeout={0}>
-        This session image will not update as you make additional commits.{" "}
-        <ExternalLink
-          role="text"
-          showLinkIcon={true}
-          title="Learn more"
-          className={cx("text-info")}
-          url={Links.RENKU_2_MIGRATION_INFO}
-        />
-      </InfoAlert>
-    </div>
+    <InfoAlert className="mb-0" dismissible={false} timeout={0}>
+      This session image will not update as you make additional commits.{" "}
+      <ExternalLink
+        role="text"
+        showLinkIcon={true}
+        title="Learn more"
+        className={cx("text-info")}
+        url={Links.RENKU_2_MIGRATION_INFO}
+      />
+    </InfoAlert>
   );
 
   return (
@@ -154,7 +153,7 @@ export function DetailsMigration({
         isProjectSupported &&
         !showDetails &&
         containerImageInfoAlert}
-      <div className="mb-2">
+      <div>
         <a
           className={cx(
             "d-inline-block",
@@ -168,66 +167,61 @@ export function DetailsMigration({
           migrated <ChevronFlippedIcon className="ms-1" flipped={showDetails} />
         </a>
       </div>
-      <div className="mb-3">
-        <Collapse isOpen={showDetails}>
-          <div className="mx-4">
-            <div className="py-2">
-              <span className="fw-bold">
-                <FileCode className={cx("bi", "me-1")} />
-                Code repository:
-              </span>{" "}
-              {codeRepository}
-            </div>
-            <div className="py-2">
-              <span className="fw-bold">
-                <FileEarmarkRuled className={cx("bi", "me-1")} /> Datasets &
-                Data in Git LFS:{" "}
-              </span>
-              Will continue to be available via the git lfs command line
-            </div>
-            <div className="py-2">
-              <span className="fw-bold">
-                <PlayCircle className={cx("bi", "me-1")} /> Session launcher{" "}
-              </span>
-            </div>
-            {detailsSession}
-            {!isPinnedImage &&
-              containerImage &&
-              isProjectSupported &&
-              showDetails &&
-              containerImageInfoAlert}
-            <div className="py-2">
-              <span className="fw-bold">
-                <BarChartSteps className={cx("bi", "me-1")} /> Workflows:{" "}
-              </span>
-              You may continue to use Renku workflows in your session via the
-              CLI.
-            </div>
-            <div className="py-2">
-              <span className="fw-bold">
-                <FileText className={cx("bi", "me-1")} /> Description:
-              </span>{" "}
-              {description ? (
-                description
-              ) : (
-                <span className="text-body-secondary">
-                  Description not found
-                </span>
-              )}
-            </div>
-            <div className="py-2">
-              <span className="fw-bold">
-                <Bookmarks className={cx("bi", "me-1")} /> Keywords:
-              </span>{" "}
-              {keywords ? (
-                keywords
-              ) : (
-                <span className="text-body-secondary">Keywords not found</span>
-              )}
-            </div>
+      <Collapse isOpen={showDetails}>
+        <div className={cx("d-flex", "flex-column", "gap-3", "mx-4")}>
+          <div>
+            <span className="fw-bold">
+              <FileCode className={cx("bi", "me-1")} />
+              Code repository:
+            </span>{" "}
+            {codeRepository}
           </div>
-        </Collapse>
-      </div>
+          <div>
+            <span className="fw-bold">
+              <FileEarmarkRuled className={cx("bi", "me-1")} /> Datasets & Data
+              in Git LFS:{" "}
+            </span>
+            Will continue to be available via the git lfs command line
+          </div>
+          <div>
+            <span className="fw-bold">
+              <PlayCircle className={cx("bi", "me-1")} /> Session launcher{" "}
+            </span>
+          </div>
+          {detailsSession}
+          {!isPinnedImage &&
+            containerImage &&
+            isProjectSupported &&
+            showDetails &&
+            containerImageInfoAlert}
+          <div>
+            <span className="fw-bold">
+              <BarChartSteps className={cx("bi", "me-1")} /> Workflows:{" "}
+            </span>
+            You may continue to use Renku workflows in your session via the CLI.
+          </div>
+          <div>
+            <span className="fw-bold">
+              <FileText className={cx("bi", "me-1")} /> Description:
+            </span>{" "}
+            {description ? (
+              description
+            ) : (
+              <span className="text-body-secondary">Description not found</span>
+            )}
+          </div>
+          <div>
+            <span className="fw-bold">
+              <Bookmarks className={cx("bi", "me-1")} /> Keywords:
+            </span>{" "}
+            {keywords ? (
+              keywords
+            ) : (
+              <span className="text-body-secondary">Keywords not found</span>
+            )}
+          </div>
+        </div>
+      </Collapse>
     </>
   );
 }
@@ -239,8 +233,8 @@ export function DetailsNotIncludedInMigration() {
   }, []);
 
   return (
-    <div>
-      <div className="mb-2">
+    <div className={cx("d-flex", "flex-column", "gap-3")}>
+      <div>
         <a
           className={cx(
             "d-inline-block",
@@ -254,34 +248,32 @@ export function DetailsNotIncludedInMigration() {
           <ChevronFlippedIcon className="ms-1" flipped={showDetails} />
         </a>
       </div>
-      <div className="mb-3">
-        <Collapse isOpen={showDetails}>
-          <div className="mx-4">
-            <div className="py-2">
-              <span className="fw-bold">
-                <People className={cx("bi", "me-1")} /> Members:
-              </span>{" "}
-              Members will not be migrated. Please add members directly to the
-              Renku 2.0 project.
-            </div>
-            <div className="py-2">
-              <span className="fw-bold">
-                <Database className={cx("bi", "me-1")} /> Cloud storage:
-              </span>{" "}
-              We&apos;re sorry, cloud storage migration isn&apos;t available at
-              the moment. Please reconfigure your cloud storage as a Renku 2.0
-              Data Connector.
-            </div>
-            <div className="py-2">
-              <span className="fw-bold">
-                <CardImage className={cx("bi", "me-1")} /> Project image:
-              </span>{" "}
-              We&apos;re sorry, project image migration isn&apos;t available at
-              the moment.
-            </div>
+      <Collapse isOpen={showDetails}>
+        <div className={cx("d-flex", "flex-column", "gap-3", "mx-4")}>
+          <div>
+            <span className="fw-bold">
+              <People className={cx("bi", "me-1")} /> Members:
+            </span>{" "}
+            Members will not be migrated. Please add members directly to the
+            Renku 2.0 project.
           </div>
-        </Collapse>
-      </div>
+          <div>
+            <span className="fw-bold">
+              <Database className={cx("bi", "me-1")} /> Cloud storage:
+            </span>{" "}
+            We&apos;re sorry, cloud storage migration isn&apos;t available at
+            the moment. Please reconfigure your cloud storage as a Renku 2.0
+            Data Connector.
+          </div>
+          <div>
+            <span className="fw-bold">
+              <CardImage className={cx("bi", "me-1")} /> Project image:
+            </span>{" "}
+            We&apos;re sorry, project image migration isn&apos;t available at
+            the moment.
+          </div>
+        </div>
+      </Collapse>
     </div>
   );
 }
diff --git a/client/src/features/project/components/projectMigration/ProjectMigrationForm.tsx b/client/src/features/project/components/projectMigration/ProjectMigrationForm.tsx
index 584cba545f..42fb64748d 100644
--- a/client/src/features/project/components/projectMigration/ProjectMigrationForm.tsx
+++ b/client/src/features/project/components/projectMigration/ProjectMigrationForm.tsx
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import cx from "classnames";
 import { DateTime } from "luxon";
 import { useEffect, useMemo } from "react";
 import {
@@ -27,6 +28,7 @@ import {
   UseFormWatch,
 } from "react-hook-form";
 import { Form } from "reactstrap";
+import { ErrorAlert } from "../../../../components/Alert";
 import { Loader } from "../../../../components/Loader";
 import { toHumanDateTime } from "../../../../utils/helpers/DateTimeUtils";
 import { GitlabProjectResponse } from "../../GitLab.types";
@@ -40,7 +42,6 @@ import {
   DetailsNotIncludedInMigration,
 } from "./ProjectMigrationDetails";
 import ProjectMigrationFormInputs from "./ProjectMigrationFormInputs";
-import { ErrorAlert } from "../../../../components/Alert";
 
 interface MigrationFormProps {
   description?: string;
@@ -185,6 +186,7 @@ export default function MigrationForm({
 
   return (
     <Form
+      className={cx("d-flex", "flex-column", "gap-3")}
       id="project-migration-form"
       noValidate
       onSubmit={handleSubmit(onSubmit)}
@@ -199,7 +201,7 @@ export default function MigrationForm({
         />
       )}
       {isFetchingSessionData && (
-        <div className="py-2">
+        <div>
           <Loader inline size={16} /> Loading session data...
         </div>
       )}
diff --git a/client/src/features/project/components/projectMigration/ProjectMigrationFormInputs.tsx b/client/src/features/project/components/projectMigration/ProjectMigrationFormInputs.tsx
index 0fcf136316..c646748ba0 100644
--- a/client/src/features/project/components/projectMigration/ProjectMigrationFormInputs.tsx
+++ b/client/src/features/project/components/projectMigration/ProjectMigrationFormInputs.tsx
@@ -73,12 +73,13 @@ export default function ProjectMigrationFormInputs({
       slug: "",
     }
   );
+  const parentPath = `${projectParentPath}/`;
   const location = useLocation();
   const isRenkuV1 = isRenkuLegacy(location.pathname);
   const formId = "project-migration-form";
   return (
-    <>
-      <div className="mb-3">
+    <div className={cx("d-flex", "flex-column", "gap-3")}>
+      <div>
         <Label className="form-label" for="migrateProjectName">
           Name
         </Label>
@@ -102,29 +103,31 @@ export default function ProjectMigrationFormInputs({
         />
         <div className="invalid-feedback">Please provide a name</div>
       </div>
-      <div className="mb-3">
-        <ProjectNamespaceFormField
-          control={control}
-          entityName="project"
-          errors={errors}
-          name="namespace"
-        />
-      </div>
-      <div className="mb-3">
-        <SlugPreviewFormField
-          compact={true}
-          control={control}
-          errors={errors}
-          name="slug"
-          resetFunction={resetUrl}
-          parentPath={projectParentPath}
-          slug={currentSlug}
-          dirtyFields={dirtyFields}
-          label="Project URL"
-          entityName="project"
-        />
+      <div>
+        <div className="mb-1">
+          <ProjectNamespaceFormField
+            control={control}
+            entityName="project"
+            errors={errors}
+            name="namespace"
+          />
+        </div>
+        <div>
+          <SlugPreviewFormField
+            compact={true}
+            control={control}
+            errors={errors}
+            name="slug"
+            resetFunction={resetUrl}
+            parentPath={parentPath}
+            slug={currentSlug}
+            dirtyFields={dirtyFields}
+            label="Project URL"
+            entityName="project"
+          />
+        </div>
       </div>
-      <div className="mb-3">
+      <div>
         <ProjectVisibilityFormField
           name="visibility"
           control={control}
@@ -132,6 +135,6 @@ export default function ProjectMigrationFormInputs({
           formId={formId}
         />
       </div>
-    </>
+    </div>
   );
 }
diff --git a/client/src/features/projectMigrationV2/MigrationV2Modal.tsx b/client/src/features/projectMigrationV2/MigrationV2Modal.tsx
index ce3c8f87ee..9b389541d1 100644
--- a/client/src/features/projectMigrationV2/MigrationV2Modal.tsx
+++ b/client/src/features/projectMigrationV2/MigrationV2Modal.tsx
@@ -92,7 +92,7 @@ export default function MigrationV2Modal({
           ? "Select project to migrate"
           : "Migrate project to Renku 2.0"}
       </ModalHeader>
-      <ModalBody className="p-4">
+      <ModalBody>
         {result.error && <RtkErrorAlert error={result.error} />}
         {step === 1 ? (
           <>
diff --git a/client/src/features/projectsV2/new/ProjectV2New.tsx b/client/src/features/projectsV2/new/ProjectV2New.tsx
index fe1f0e2219..d54bdca246 100644
--- a/client/src/features/projectsV2/new/ProjectV2New.tsx
+++ b/client/src/features/projectsV2/new/ProjectV2New.tsx
@@ -199,30 +199,31 @@ function ProjectV2CreationDetails() {
                 formId={formId}
                 name="name"
               />
+              <div>
+                <div className="mb-1">
+                  <ProjectNamespaceFormField
+                    control={control}
+                    ensureNamespace={defaultNamespace}
+                    entityName={`${formId}-project`}
+                    errors={errors}
+                    name="namespace"
+                  />
+                </div>
 
-              <div className="mb-1">
-                <ProjectNamespaceFormField
+                <SlugPreviewFormField
+                  compact={true}
                   control={control}
-                  ensureNamespace={defaultNamespace}
-                  entityName={`${formId}-project`}
                   errors={errors}
-                  name="namespace"
+                  name="slug"
+                  resetFunction={resetUrl}
+                  parentPath={parentPath}
+                  slug={currentSlug}
+                  dirtyFields={dirtyFields}
+                  label="Project URL"
+                  entityName="project"
                 />
               </div>
 
-              <SlugPreviewFormField
-                compact={true}
-                control={control}
-                errors={errors}
-                name="slug"
-                resetFunction={resetUrl}
-                parentPath={parentPath}
-                slug={currentSlug}
-                dirtyFields={dirtyFields}
-                label="Project URL"
-                entityName="project"
-              />
-
               <div className="mb-1">
                 <ProjectVisibilityFormField
                   formId={formId}