From b5d41fcccc46f8c6144f02c2ed16862f86f6d18b Mon Sep 17 00:00:00 2001
From: Chandrasekhar Ramakrishnan <ciyer@users.noreply.github.com>
Date: Mon, 17 Nov 2025 11:55:44 +0100
Subject: [PATCH 1/7] minor: make form labels bold

---
 client/src/features/projectsV2/new/ProjectV2New.tsx       | 6 +++---
 .../components/SessionForm/SessionEnvironmentItem.tsx     | 8 +++++---
 client/src/styles/renku_bootstrap_customization.scss      | 5 +++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/client/src/features/projectsV2/new/ProjectV2New.tsx b/client/src/features/projectsV2/new/ProjectV2New.tsx
index 1824acee01..847515c995 100644
--- a/client/src/features/projectsV2/new/ProjectV2New.tsx
+++ b/client/src/features/projectsV2/new/ProjectV2New.tsx
@@ -25,7 +25,7 @@ import {
   Button,
   Form,
   FormGroup,
-  Label,
+  FormText,
   ModalBody,
   ModalFooter,
 } from "reactstrap";
@@ -241,10 +241,10 @@ function ProjectV2CreationDetails() {
               />
 
               <div>
-                <Label className="mb-0" for="projectV2NewForm-users">
+                <FormText className="mb-0" color="body">
                   <InfoCircle className="bi" /> You can add members after
                   creating the project.
-                </Label>
+                </FormText>
               </div>
 
               {result.error && <RtkOrNotebooksError error={result.error} />}
diff --git a/client/src/features/sessionsV2/components/SessionForm/SessionEnvironmentItem.tsx b/client/src/features/sessionsV2/components/SessionForm/SessionEnvironmentItem.tsx
index 6891405f2f..1405ac6053 100644
--- a/client/src/features/sessionsV2/components/SessionForm/SessionEnvironmentItem.tsx
+++ b/client/src/features/sessionsV2/components/SessionForm/SessionEnvironmentItem.tsx
@@ -115,12 +115,14 @@ export function SessionEnvironmentItem({
           for={`addSessionLauncherGlobalEnvironment-${id}`}
         >
           <h4 className="fw-semibold">{name}</h4>
-          <p className="mb-2">
+          <p className={cx("mb-2", "fw-normal")}>
             <EnvironmentIcon type="global" className="me-1" />
             Global environment
           </p>
-          {description ? <p className="mb-2">{description}</p> : null}
-          <p className="m-0">
+          {description ? (
+            <p className={cx("mb-2", "fw-normal")}>{description}</p>
+          ) : null}
+          <p className={cx("m-0", "fw-normal")}>
             <TimeCaption
               datetime={creation_date}
               enableTooltip
diff --git a/client/src/styles/renku_bootstrap_customization.scss b/client/src/styles/renku_bootstrap_customization.scss
index 145f679a20..25f5b73278 100644
--- a/client/src/styles/renku_bootstrap_customization.scss
+++ b/client/src/styles/renku_bootstrap_customization.scss
@@ -121,6 +121,11 @@ $list-group-item-padding-y: $spacer;
   }
 }
 
+// Make form labels bold
+.form-label {
+  font-weight: bold;
+}
+
 // Adjust Accordion
 $accordion-padding-x: $spacer;
 $accordion-body-padding-x: $spacer;

From 743abcb96486c52614364d56c8f4982c56756a5e Mon Sep 17 00:00:00 2001
From: Chandrasekhar Ramakrishnan <ciyer@users.noreply.github.com>
Date: Fri, 21 Nov 2025 10:21:43 +0100
Subject: [PATCH 2/7] minor: make field-labels .mb-1

---
 client/src/styles/renku_bootstrap_customization.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/styles/renku_bootstrap_customization.scss b/client/src/styles/renku_bootstrap_customization.scss
index 25f5b73278..9eac2116bc 100644
--- a/client/src/styles/renku_bootstrap_customization.scss
+++ b/client/src/styles/renku_bootstrap_customization.scss
@@ -124,6 +124,7 @@ $list-group-item-padding-y: $spacer;
 // Make form labels bold
 .form-label {
   font-weight: bold;
+  margin-bottom: $spacer * 0.25 !important;
 }
 
 // Adjust Accordion

From 6d5b557047f92a74b9684cdfa1da7dfb4fcdd200 Mon Sep 17 00:00:00 2001
From: Chandrasekhar Ramakrishnan <ciyer@users.noreply.github.com>
Date: Tue, 25 Nov 2025 10:50:30 +0100
Subject: [PATCH 3/7] minor: clean up session launcher form

---
 .../SessionForm/AdvancedSettingsFields.tsx    | 81 +++++++++++--------
 .../SessionForm/CustomEnvironmentFields.tsx   |  2 +-
 2 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx b/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx
index 919c57b79a..5d65c9c706 100644
--- a/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx
+++ b/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx
@@ -43,6 +43,38 @@ function OptionalLabel() {
   return <span className={cx("small", "text-muted")}>(Optional)</span>;
 }
 
+interface FormFieldLabelProps<T extends FieldValues> {
+  info: string;
+  isOptional?: boolean;
+  label: ReactNode;
+  name: Path<T>;
+}
+
+function FormFieldLabel<T extends FieldValues>({
+  info,
+  isOptional,
+  label,
+  name,
+}: FormFieldLabelProps<T>) {
+  return (
+    <div className={cx("d-flex", "align-items-center", "gap-2", "mb-1")}>
+      <Label
+        for={`addSessionLauncher${name}`}
+        className="mb-0"
+        aria-required={isOptional ? "false" : "true"}
+      >
+        {label}
+      </Label>
+      {info && (
+        <MoreInfo>
+          <LazyRenkuMarkdown markdownText={info} />
+        </MoreInfo>
+      )}
+      {isOptional && <OptionalLabel />}
+    </div>
+  );
+}
+
 function FormField<T extends FieldValues>({
   control,
   errors,
@@ -53,16 +85,12 @@ function FormField<T extends FieldValues>({
   rules,
   type = "text",
   isOptional,
-}: {
+}: FormFieldLabelProps<T> & {
   control: Control<T>;
   errors?: FieldErrors<T>;
-  info: string;
-  label: ReactNode;
-  name: Path<T>;
   placeholder?: string;
   rules?: ControllerProps<T>["rules"];
   type: InputType;
-  isOptional?: boolean;
 }) {
   if (type === "checkbox" || type === "radio") {
     return (
@@ -82,20 +110,12 @@ function FormField<T extends FieldValues>({
 
   return (
     <>
-      <Label
-        for={`addSessionLauncher${name}`}
-        className={cx("align-items-center", "d-flex", "gap-2")}
-        aria-required={isOptional ? "false" : "true"}
-      >
-        {label}
-        {info && (
-          <MoreInfo>
-            <LazyRenkuMarkdown markdownText={info} />
-          </MoreInfo>
-        )}
-
-        {isOptional && <OptionalLabel />}
-      </Label>
+      <FormFieldLabel
+        info={info}
+        isOptional={isOptional}
+        label={label}
+        name={name}
+      />
       <Controller
         control={control}
         name={name}
@@ -207,20 +227,12 @@ function JsonField<T extends FieldValues>({
 }: JsonFieldProps<T>) {
   return (
     <>
-      <Label
-        for={`addSessionLauncher${name}`}
-        className={cx("align-items-center", "d-flex", "gap-2")}
-      >
-        {label}
-        {info && (
-          <MoreInfo>
-            <LazyRenkuMarkdown markdownText={info} />
-          </MoreInfo>
-        )}
-        {isOptional && <OptionalLabel />}
-      </Label>
-
-      <FormText tag="div">{helpText}</FormText>
+      <FormFieldLabel
+        info={info}
+        isOptional={isOptional}
+        label={label}
+        name={name}
+      />
       <Controller
         control={control}
         name={name}
@@ -237,6 +249,7 @@ function JsonField<T extends FieldValues>({
           />
         )}
       />
+      <FormText tag="div">{helpText}</FormText>
       {errors?.[name] && (
         <div className="invalid-feedback mt-0 d-block">
           {errors[name]?.message?.toString()}
@@ -295,7 +308,7 @@ export function AdvancedSettingsFields<
 
       <div className="row">
         <div className={cx("col-12")}>
-          <h4 className="fw-bold">Docker settings</h4>
+          <h3 className={cx("fw-bold", "mt-3")}>Docker settings</h3>
         </div>
       </div>
 
diff --git a/client/src/features/sessionsV2/components/SessionForm/CustomEnvironmentFields.tsx b/client/src/features/sessionsV2/components/SessionForm/CustomEnvironmentFields.tsx
index cd8cc4e45d..d0ca4c490c 100644
--- a/client/src/features/sessionsV2/components/SessionForm/CustomEnvironmentFields.tsx
+++ b/client/src/features/sessionsV2/components/SessionForm/CustomEnvironmentFields.tsx
@@ -130,7 +130,7 @@ export function CustomEnvironmentFields({
       </div>
 
       <div>
-        <h4 className="fw-bold">Advanced settings</h4>
+        <h3 className={cx("fw-bold", "mt-3")}>Advanced settings</h3>
 
         <InfoAlert dismissible={false} timeout={0}>
           <p className="mb-0">

From 939727a0e6e628f6e8902de7d68e4f1b95b1fe13 Mon Sep 17 00:00:00 2001
From: Chandrasekhar Ramakrishnan <ciyer@users.noreply.github.com>
Date: Tue, 25 Nov 2025 11:14:41 +0100
Subject: [PATCH 4/7] minor: clean up data connector form labels

---
 .../cloudStorage/AddOrEditCloudStorage.tsx           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx b/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
index 70179ed9a9..b45c60d4bd 100644
--- a/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
+++ b/client/src/features/project/components/cloudStorage/AddOrEditCloudStorage.tsx
@@ -395,7 +395,9 @@ function CheckboxOptionItem({
           />
         )}
       />
-      <label htmlFor={option.name}>{option.friendlyName ?? option.name}</label>
+      <label className="form-label" htmlFor={option.name}>
+        {option.friendlyName ?? option.name}
+      </label>
     </>
   );
 }
@@ -434,7 +436,7 @@ function PasswordOptionItem({
   const tooltipContainerId = `option-is-secret-${option.name}`;
   return (
     <>
-      <label htmlFor={option.name}>
+      <label className="form-label" htmlFor={option.name}>
         {option.friendlyName ?? option.name}{" "}
         <div id={tooltipContainerId} className="d-inline">
           <KeyFill className={cx("bi", "ms-1")} />
@@ -514,7 +516,7 @@ function PasswordOptionItemStored({
   const tooltipContainerId = `option-is-secret-${option.name}`;
   return (
     <>
-      <label htmlFor={option.name}>
+      <label className="form-label" htmlFor={option.name}>
         {option.friendlyName ?? option.name}{" "}
         <div id={tooltipContainerId} className="d-inline">
           <KeyFill className={cx("bi", "ms-1")} />
@@ -582,7 +584,9 @@ function InputOptionItem({
       : option.friendlyName ?? option.name;
   return (
     <>
-      <label htmlFor={option.name}>{inputName}</label>
+      <label className="form-label" htmlFor={option.name}>
+        {inputName}
+      </label>
 
       <Controller
         name={option.name}

From ed4623a7b93a62b403adb8f704d36d972afbec0f Mon Sep 17 00:00:00 2001
From: Chandrasekhar Ramakrishnan <ciyer@users.noreply.github.com>
Date: Tue, 25 Nov 2025 11:46:09 +0100
Subject: [PATCH 5/7] minor: fix spacing before and after the
 SlugPreviewFormField

---
 .../DataConnectorModalBody.tsx                |  3 --
 client/src/features/groupsV2/new/GroupNew.tsx | 15 +++++-----
 .../ProjectMigrationFormInputs.tsx            |  2 --
 .../fields/SlugPreviewFormField.module.scss   |  8 +++++
 .../fields/SlugPreviewFormField.tsx           | 13 ++++++--
 .../features/projectsV2/new/ProjectV2New.tsx  | 19 ++++++------
 tests/cypress/e2e/projectV2setup.spec.ts      |  3 +-
 .../projectV2/read-projectV2-namespace.json   |  9 ++++++
 .../support/renkulab-fixtures/namespaceV2.ts  | 30 +++++++++++++++++++
 9 files changed, 75 insertions(+), 27 deletions(-)
 create mode 100644 client/src/features/projectsV2/fields/SlugPreviewFormField.module.scss
 create mode 100644 tests/cypress/fixtures/projectV2/read-projectV2-namespace.json

diff --git a/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx b/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx
index 01d2cfb4bd..b1d4b86802 100644
--- a/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx
+++ b/client/src/features/dataConnectorsV2/components/DataConnectorModal/DataConnectorModalBody.tsx
@@ -400,9 +400,6 @@ export function DataConnectorMount({
         <div className="invalid-feedback">
           {errors.name?.message?.toString()}
         </div>
-      </div>
-
-      <div className="mb-3">
         <SlugPreviewFormField
           compact={true}
           control={control}
diff --git a/client/src/features/groupsV2/new/GroupNew.tsx b/client/src/features/groupsV2/new/GroupNew.tsx
index 5b61f15c2f..7a6eadfd73 100644
--- a/client/src/features/groupsV2/new/GroupNew.tsx
+++ b/client/src/features/groupsV2/new/GroupNew.tsx
@@ -174,15 +174,14 @@ function GroupV2CreationDetails() {
         >
           <FormGroup className="d-inline" disabled={result.isLoading}>
             <div className={cx("d-flex", "flex-column", "gap-3")}>
+              {/* No margin bottom because the SlugPreviewFormField is larger */}
               <div>
-                <div className="mb-1">
-                  <NameFormField
-                    control={control}
-                    entityName="group"
-                    errors={errors}
-                    name="name"
-                  />
-                </div>
+                <NameFormField
+                  control={control}
+                  entityName="group"
+                  errors={errors}
+                  name="name"
+                />
 
                 <SlugPreviewFormField
                   compact={true}
diff --git a/client/src/features/project/components/projectMigration/ProjectMigrationFormInputs.tsx b/client/src/features/project/components/projectMigration/ProjectMigrationFormInputs.tsx
index e80d7aa3c3..05b255cb52 100644
--- a/client/src/features/project/components/projectMigration/ProjectMigrationFormInputs.tsx
+++ b/client/src/features/project/components/projectMigration/ProjectMigrationFormInputs.tsx
@@ -112,8 +112,6 @@ export default function ProjectMigrationFormInputs({
             errors={errors}
             name="namespace"
           />
-        </div>
-        <div>
           <SlugPreviewFormField
             compact={true}
             control={control}
diff --git a/client/src/features/projectsV2/fields/SlugPreviewFormField.module.scss b/client/src/features/projectsV2/fields/SlugPreviewFormField.module.scss
new file mode 100644
index 0000000000..aa64978268
--- /dev/null
+++ b/client/src/features/projectsV2/fields/SlugPreviewFormField.module.scss
@@ -0,0 +1,8 @@
+.slugPreviewGroup {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+.slugPreviewButton {
+  margin-top: -2px;
+}
diff --git a/client/src/features/projectsV2/fields/SlugPreviewFormField.tsx b/client/src/features/projectsV2/fields/SlugPreviewFormField.tsx
index 75511077b8..c0c499ab1d 100644
--- a/client/src/features/projectsV2/fields/SlugPreviewFormField.tsx
+++ b/client/src/features/projectsV2/fields/SlugPreviewFormField.tsx
@@ -26,6 +26,8 @@ import AppContext from "../../../utils/context/appContext.ts";
 import { SlugPreviewFormFieldProps } from "./formField.types.ts";
 import SlugFormField from "./SlugFormField";
 
+import styles from "./SlugPreviewFormField.module.scss";
+
 export default function SlugPreviewFormField<T extends FieldValues>({
   compact = false,
   control,
@@ -53,7 +55,13 @@ export default function SlugPreviewFormField<T extends FieldValues>({
         </span>
       </FormText>
       <button
-        className={cx("btn", "btn-link", "p-0", "mb-1", "text-decoration-none")}
+        className={cx(
+          "btn",
+          "btn-link",
+          "p-0",
+          "text-decoration-none",
+          styles.slugPreviewButton
+        )}
         data-cy={`${entityName}-slug-toggle`}
         onClick={toggleCollapse}
         type="button"
@@ -65,9 +73,8 @@ export default function SlugPreviewFormField<T extends FieldValues>({
   );
 
   return (
-    <div>
+    <div className={cx(styles.slugPreviewGroup)}>
       {slugPreview}
-
       {isCollapseOpen && (
         <>
           <div
diff --git a/client/src/features/projectsV2/new/ProjectV2New.tsx b/client/src/features/projectsV2/new/ProjectV2New.tsx
index 847515c995..0c27ad71d5 100644
--- a/client/src/features/projectsV2/new/ProjectV2New.tsx
+++ b/client/src/features/projectsV2/new/ProjectV2New.tsx
@@ -199,17 +199,16 @@ function ProjectV2CreationDetails() {
                 formId={formId}
                 name="name"
               />
-              <div>
-                <div className="mb-1">
-                  <ProjectNamespaceFormField
-                    control={control}
-                    ensureNamespace={defaultNamespace}
-                    entityName={`${formId}-project`}
-                    errors={errors}
-                    name="namespace"
-                  />
-                </div>
 
+              {/* No margin bottom because the SlugPreviewFormField is larger */}
+              <div>
+                <ProjectNamespaceFormField
+                  control={control}
+                  ensureNamespace={defaultNamespace}
+                  entityName={`${formId}-project`}
+                  errors={errors}
+                  name="namespace"
+                />
                 <SlugPreviewFormField
                   compact={true}
                   control={control}
diff --git a/tests/cypress/e2e/projectV2setup.spec.ts b/tests/cypress/e2e/projectV2setup.spec.ts
index e0d91e4ef4..098be34e3c 100644
--- a/tests/cypress/e2e/projectV2setup.spec.ts
+++ b/tests/cypress/e2e/projectV2setup.spec.ts
@@ -207,7 +207,8 @@ describe("Set up data connectors", () => {
         namespace: "user1-uuid/test-2-v2-project",
         visibility: "public",
       })
-      .postDataConnectorProjectLink({ dataConnectorId: "ULID-5" });
+      .postDataConnectorProjectLink({ dataConnectorId: "ULID-5" })
+      .readProjectV2Namespace();
     cy.visit("/p/user1-uuid/test-2-v2-project");
     cy.wait("@readProjectV2WithoutDocumentation");
     cy.wait("@listProjectDataConnectors");
diff --git a/tests/cypress/fixtures/projectV2/read-projectV2-namespace.json b/tests/cypress/fixtures/projectV2/read-projectV2-namespace.json
new file mode 100644
index 0000000000..7435ca9354
--- /dev/null
+++ b/tests/cypress/fixtures/projectV2/read-projectV2-namespace.json
@@ -0,0 +1,9 @@
+{
+  "id": "namespace-id",
+  "name": "test-2-v2-project",
+  "slug": "test-2-v2-project",
+  "path": "user1-uuid/test-2-v2-project",
+  "creation_date": "2023-11-15T09:55:59Z",
+  "created_by": "user-id",
+  "namespace_kind": "project"
+}
diff --git a/tests/cypress/support/renkulab-fixtures/namespaceV2.ts b/tests/cypress/support/renkulab-fixtures/namespaceV2.ts
index 2b6e2ab434..84962886fb 100644
--- a/tests/cypress/support/renkulab-fixtures/namespaceV2.ts
+++ b/tests/cypress/support/renkulab-fixtures/namespaceV2.ts
@@ -53,6 +53,11 @@ interface ListManyNamespacesArgs extends NameOnlyFixture {
   numberOfNamespaces?: number;
 }
 
+interface ProjectV2Args extends SimpleFixture {
+  projectNamespace?: string;
+  projectSlug?: string;
+}
+
 interface UserNamespaceV2Args extends SimpleFixture {
   username?: string;
 }
@@ -308,6 +313,31 @@ export function NamespaceV2<T extends FixturesConstructor>(Parent: T) {
       return this;
     }
 
+    readProjectV2Namespace(args?: ProjectV2Args) {
+      const {
+        fixture = "projectV2/read-projectV2-namespace.json",
+        name = "readProjectV2Namespace",
+        projectNamespace = "user1-uuid",
+        projectSlug = "test-2-v2-project",
+      } = args ?? {};
+      cy.fixture(fixture).then((namespace_) => {
+        const namespace = {
+          ...namespace_,
+          name: projectSlug,
+          slug: projectSlug,
+          path: `${projectNamespace}/${projectSlug}`,
+        };
+        cy.intercept(
+          "GET",
+          `/api/data/namespaces/${projectNamespace}/${projectSlug}`,
+          {
+            body: namespace,
+          }
+        ).as(name);
+      });
+      return this;
+    }
+
     readUserV2Namespace(args?: UserNamespaceV2Args) {
       const {
         fixture = "namespaceV2/namespaceV2-user1.json",

From 5c4e8c46fc2c28423e7118dbc5e7cf37c5f97a3a Mon Sep 17 00:00:00 2001
From: Chandrasekhar Ramakrishnan <ciyer@users.noreply.github.com>
Date: Wed, 26 Nov 2025 11:25:20 +0100
Subject: [PATCH 6/7] minor: clean up session secret slot form

---
 .../SessionSecrets/ProjectSessionSecrets.tsx                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/features/ProjectPageV2/ProjectPageContent/SessionSecrets/ProjectSessionSecrets.tsx b/client/src/features/ProjectPageV2/ProjectPageContent/SessionSecrets/ProjectSessionSecrets.tsx
index 53675d5ea9..a6e50e8d6c 100644
--- a/client/src/features/ProjectPageV2/ProjectPageContent/SessionSecrets/ProjectSessionSecrets.tsx
+++ b/client/src/features/ProjectPageV2/ProjectPageContent/SessionSecrets/ProjectSessionSecrets.tsx
@@ -141,8 +141,8 @@ export default function ProjectSessionSecrets() {
       </CardHeader>
       <CardBody>
         <div className={cx(sessionSecretSlots?.length !== 0 && "mb-3")}>
-          <p className="mb-1">
-            Session secrets will be mounted at the following location:
+          <p className={cx("form-label", "mb-1")}>
+            Session secrets will be mounted at the following location
           </p>
           <SecretsMountDirectoryComponent />
         </div>

From 92d1777b16960ba1c172ca415f5361eb9171ef06 Mon Sep 17 00:00:00 2001
From: Chandrasekhar Ramakrishnan <ciyer@users.noreply.github.com>
Date: Wed, 26 Nov 2025 12:05:45 +0100
Subject: [PATCH 7/7] minor: consistantly show field error message before help

---
 .../ProjectConnectDataConnectorsModal.tsx              | 10 +++++-----
 .../projectsV2/fields/DescriptionFormField.tsx         |  2 +-
 .../components/SessionForm/AdvancedSettingsFields.tsx  |  2 +-
 .../components/SessionForm/LauncherDetailsFields.tsx   |  8 ++++----
 .../SessionModals/ModifyResourcesLauncher.tsx          |  8 ++++----
 .../components/SessionModals/SelectResourceClass.tsx   |  8 ++++----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/client/src/features/ProjectPageV2/ProjectPageContent/DataConnectors/ProjectConnectDataConnectorsModal.tsx b/client/src/features/ProjectPageV2/ProjectPageContent/DataConnectors/ProjectConnectDataConnectorsModal.tsx
index 261e0b2a86..4a7a1d6fe1 100644
--- a/client/src/features/ProjectPageV2/ProjectPageContent/DataConnectors/ProjectConnectDataConnectorsModal.tsx
+++ b/client/src/features/ProjectPageV2/ProjectPageContent/DataConnectors/ProjectConnectDataConnectorsModal.tsx
@@ -372,10 +372,6 @@ function ProjectLinkDataConnectorBodyAndFooter({
               pattern: /^[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+){0,2}$/,
             }}
           />
-          <div className="form-text">
-            Paste a data connector identifier. You can find it on the the data
-            connector&apos;s side panel
-          </div>
           <div className="invalid-feedback">
             {errors.dataConnectorIdentifier == null
               ? undefined
@@ -384,6 +380,10 @@ function ProjectLinkDataConnectorBodyAndFooter({
               ? errors.dataConnectorIdentifier.message
               : "Please provide an identifier for the data connector"}
           </div>
+          <div className="form-text">
+            Paste a data connector identifier. You can find it on the the data
+            connector&apos;s side panel
+          </div>
         </div>
         {error != null && <RtkOrNotebooksError error={error} />}
       </ModalBody>
@@ -530,10 +530,10 @@ function ProjectDoiDataConnectorBodyAndFooter({
               required: true,
             }}
           />
+          <div className="invalid-feedback">Please provide a valid DOI</div>
           <div className="form-text">
             Paste a DOI, e.g. <code>10.5281/zenodo.3831980</code>.
           </div>
-          <div className="invalid-feedback">Please provide a valid DOI</div>
         </div>
         {error !== null && <RtkOrNotebooksError error={error} />}
       </ModalBody>
diff --git a/client/src/features/projectsV2/fields/DescriptionFormField.tsx b/client/src/features/projectsV2/fields/DescriptionFormField.tsx
index c762647cc2..40831bca14 100644
--- a/client/src/features/projectsV2/fields/DescriptionFormField.tsx
+++ b/client/src/features/projectsV2/fields/DescriptionFormField.tsx
@@ -50,10 +50,10 @@ export default function DescriptionFormField<T extends FieldValues>({
         )}
         rules={{ maxLength: 500, required: false }}
       />
+      <div className="invalid-feedback">Please provide a description</div>
       <FormText id={`${entityName}DescriptionHelp`} className="input-hint">
         A brief (at most 500 character) description of the {entityName}.
       </FormText>
-      <div className="invalid-feedback">Please provide a description</div>
     </div>
   );
 }
diff --git a/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx b/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx
index 5d65c9c706..fadcacff43 100644
--- a/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx
+++ b/client/src/features/sessionsV2/components/SessionForm/AdvancedSettingsFields.tsx
@@ -249,12 +249,12 @@ function JsonField<T extends FieldValues>({
           />
         )}
       />
-      <FormText tag="div">{helpText}</FormText>
       {errors?.[name] && (
         <div className="invalid-feedback mt-0 d-block">
           {errors[name]?.message?.toString()}
         </div>
       )}
+      <FormText tag="div">{helpText}</FormText>
     </>
   );
 }
diff --git a/client/src/features/sessionsV2/components/SessionForm/LauncherDetailsFields.tsx b/client/src/features/sessionsV2/components/SessionForm/LauncherDetailsFields.tsx
index 599b625e69..a12ad02b80 100644
--- a/client/src/features/sessionsV2/components/SessionForm/LauncherDetailsFields.tsx
+++ b/client/src/features/sessionsV2/components/SessionForm/LauncherDetailsFields.tsx
@@ -184,14 +184,14 @@ export function LauncherDetailsFields({ control }: LauncherDetailsFieldsProps) {
                       Gigabytes
                     </UncontrolledTooltip>
                   </InputGroup>
-                  <FormText>
-                    Default: {watchCurrentSessionClass.default_storage} GB, max:{" "}
-                    {watchCurrentSessionClass.max_storage} GB
-                  </FormText>
                   <div className="invalid-feedback">
                     {error?.message ||
                       "Please provide a valid value for disk storage."}
                   </div>
+                  <FormText>
+                    Default: {watchCurrentSessionClass.default_storage} GB, max:{" "}
+                    {watchCurrentSessionClass.max_storage} GB
+                  </FormText>
                 </>
               )}
               rules={{
diff --git a/client/src/features/sessionsV2/components/SessionModals/ModifyResourcesLauncher.tsx b/client/src/features/sessionsV2/components/SessionModals/ModifyResourcesLauncher.tsx
index 6a9f418524..392182e972 100644
--- a/client/src/features/sessionsV2/components/SessionModals/ModifyResourcesLauncher.tsx
+++ b/client/src/features/sessionsV2/components/SessionModals/ModifyResourcesLauncher.tsx
@@ -236,14 +236,14 @@ export function ModifyResourcesLauncherModal({
                       Gigabytes
                     </UncontrolledTooltip>
                   </InputGroup>
-                  <FormText>
-                    Default: {watchCurrentSessionClass.default_storage} GB, max:{" "}
-                    {watchCurrentSessionClass.max_storage} GB
-                  </FormText>
                   <div className="invalid-feedback">
                     {error?.message ||
                       "Please provide a valid value for disk storage."}
                   </div>
+                  <FormText>
+                    Default: {watchCurrentSessionClass.default_storage} GB, max:{" "}
+                    {watchCurrentSessionClass.max_storage} GB
+                  </FormText>
                 </>
               )}
               rules={{
diff --git a/client/src/features/sessionsV2/components/SessionModals/SelectResourceClass.tsx b/client/src/features/sessionsV2/components/SessionModals/SelectResourceClass.tsx
index 4954be11a7..45bc091f51 100644
--- a/client/src/features/sessionsV2/components/SessionModals/SelectResourceClass.tsx
+++ b/client/src/features/sessionsV2/components/SessionModals/SelectResourceClass.tsx
@@ -219,14 +219,14 @@ export function SelectResourceClassModal({
                       Gigabytes
                     </UncontrolledTooltip>
                   </InputGroup>
-                  <FormText>
-                    Default: {watchCurrentSessionClass.default_storage} GB, max:{" "}
-                    {watchCurrentSessionClass.max_storage} GB
-                  </FormText>
                   <div className="invalid-feedback">
                     {error?.message ||
                       "Please provide a valid value for disk storage."}
                   </div>
+                  <FormText>
+                    Default: {watchCurrentSessionClass.default_storage} GB, max:{" "}
+                    {watchCurrentSessionClass.max_storage} GB
+                  </FormText>
                 </>
               )}
               rules={{