diff --git a/src/app/core/interceptors/auth.interceptor.ts b/src/app/core/interceptors/auth.interceptor.ts
index 1ba2c58ba..aaaee6079 100644
--- a/src/app/core/interceptors/auth.interceptor.ts
+++ b/src/app/core/interceptors/auth.interceptor.ts
@@ -6,9 +6,10 @@ export const authInterceptor: HttpInterceptorFn = (
   req: HttpRequest<unknown>,
   next: HttpHandlerFn
 ): Observable<HttpEvent<unknown>> => {
-  const authToken = 'UlO9O9GNKgVzJD7pUeY53jiQTKJ4U2znXVWNvh0KZQruoENuILx0IIYf9LoDz7Duq72EIm';
+  const authToken = '2rjFZwmdDG4rtKj7hGkEMO6XyHBM2lN7XBbsA1e8OqcFhOWu6Z7fQZiheu9RXtzSeVrgOt';
   // UlO9O9GNKgVzJD7pUeY53jiQTKJ4U2znXVWNvh0KZQruoENuILx0IIYf9LoDz7Duq72EIm kyrylo
   // 2rjFZwmdDG4rtKj7hGkEMO6XyHBM2lN7XBbsA1e8OqcFhOWu6Z7fQZiheu9RXtzSeVrgOt roman nastyuk
+  // yZ485nN6MfhqvGrfU4Xk5BEnq0T6LM50nQ6H9VrYaMTaZUQNTuxnIwlp0Wpz879RCsK9GQ NM stage3
   const localStorageToken = localStorage.getItem('authToken');
   const token = localStorageToken || authToken;
   if (token) {
diff --git a/src/app/features/registries/components/custom-step/custom-step.component.html b/src/app/features/registries/components/custom-step/custom-step.component.html
index 2c3c77e4b..a34f93398 100644
--- a/src/app/features/registries/components/custom-step/custom-step.component.html
+++ b/src/app/features/registries/components/custom-step/custom-step.component.html
@@ -6,73 +6,71 @@ <h2>{{ currentPage().title }}</h2>
 
     @if (currentPage().sections?.length) {
       @for (section of currentPage().sections; track section.id) {
-        questions = section.questions;
         <p-card>
           <h3 class="mb-2">{{ section.title }}</h3>
           @if (section.description) {
             <p class="mb-3">{{ section.description }}</p>
           }
-          <ng-container *ngTemplateOutlet="questionList"></ng-container>
+          <ng-container *ngTemplateOutlet="questionList; context: { $implicit: section.questions }"></ng-container>
         </p-card>
       }
     } @else {
-      <ng-container *ngTemplateOutlet="questionList"></ng-container>
+      <ng-container *ngTemplateOutlet="questionList; context: { $implicit: questions }"></ng-container>
     }
 
-    <ng-template #questionList>
-      @for (question of questions; track question.id) {
+    <ng-template #questionList let-questions>
+      @for (q of questions; track q.id) {
         <form [formGroup]="stepForm">
           <p-card>
-            <label [for]="question.groupKey">
+            <label [for]="q.groupKey">
               <h3 class="mb-2">
-                {{ question.displayText }}
-                @if (question.required) {
+                {{ q.displayText }}
+                @if (q.required) {
                   <span class="text-red-500">*</span>
                 }
               </h3>
-              @if (question.helpText) {
-                <p class="mb-3">{{ question.helpText }}</p>
+              @if (q.helpText) {
+                <p class="mb-3">{{ q.helpText }}</p>
               }
-              @if (question.paragraphText) {
-                <p class="mb-3">{{ question.paragraphText }}</p>
+              @if (q.paragraphText) {
+                <p class="mb-3">{{ q.paragraphText }}</p>
               }
             </label>
-            @if (question.exampleText) {
+            @if (q.exampleText) {
               <p-inplace #inplaceRef styleClass="mb-4">
                 <ng-template #display>
-                  <span class="text-primary">{{ 'common.links.showExample' | translate }} </span>
+                  <span class="text-primary font-medium">{{ 'common.links.showExample' | translate }} </span>
                 </ng-template>
                 <ng-template #content>
-                  <div class="p-inplace-display">
-                    <button
-                      class="text-primary border-none cursor-pointer bg-transparent text-sm"
-                      tabindex="0"
-                      role="button"
-                      (click)="inplaceRef.deactivate()"
-                      (keyup.enter)="inplaceRef.deactivate()"
-                      (keyup.space)="inplaceRef.deactivate()"
-                    >
+                  <div
+                    class="p-inplace-display"
+                    tabindex="0"
+                    (click)="inplaceRef.deactivate()"
+                    (keyup.enter)="inplaceRef.deactivate()"
+                    (keyup.space)="inplaceRef.deactivate()"
+                  >
+                    <button class="text-primary border-none cursor-pointer bg-transparent text-sm">
                       {{ 'common.links.hideExample' | translate }}
                     </button>
                   </div>
-                  <p class="m-0">{{ question.exampleText }}</p>
+                  <p class="m-0">{{ q.exampleText }}</p>
                 </ng-template>
               </p-inplace>
             }
 
-            @switch (question.fieldType) {
+            @switch (q.fieldType) {
               @case (FieldType.TextArea) {
                 <textarea
-                  id="{{ question.groupKey }}"
+                  id="{{ q.groupKey }}"
                   class="w-full"
                   rows="5"
                   cols="30"
                   pTextarea
-                  [formControlName]="question.responseKey!"
+                  [formControlName]="q.responseKey!"
                 ></textarea>
                 @if (
-                  stepForm.controls[question.responseKey!].errors?.['required'] &&
-                  (stepForm.controls[question.responseKey!].touched || stepForm.controls[question.responseKey!].dirty)
+                  stepForm.controls[q.responseKey!].errors?.['required'] &&
+                  (stepForm.controls[q.responseKey!].touched || stepForm.controls[q.responseKey!].dirty)
                 ) {
                   <p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small">
                     {{ INPUT_VALIDATION_MESSAGES.required | translate }}
@@ -81,10 +79,10 @@ <h3 class="mb-2">
               }
               @case (FieldType.Radio) {
                 <div class="flex flex-column gap-2">
-                  @for (option of question.options; track option) {
+                  @for (option of q.options; track option) {
                     <div class="flex align -items-center gap-2">
                       <p-radioButton
-                        [formControlName]="question.responseKey!"
+                        [formControlName]="q.responseKey!"
                         [inputId]="option.value"
                         [value]="option.value"
                       ></p-radioButton>
@@ -96,8 +94,8 @@ <h3 class="mb-2">
                   }
                 </div>
                 @if (
-                  stepForm.controls[question.responseKey!].errors?.['required'] &&
-                  (stepForm.controls[question.responseKey!].touched || stepForm.controls[question.responseKey!].dirty)
+                  stepForm.controls[q.responseKey!].errors?.['required'] &&
+                  (stepForm.controls[q.responseKey!].touched || stepForm.controls[q.responseKey!].dirty)
                 ) {
                   <p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small">
                     {{ INPUT_VALIDATION_MESSAGES.required | translate }}
@@ -106,20 +104,23 @@ <h3 class="mb-2">
               }
               @case (FieldType.Checkbox) {
                 <div class="flex flex-column gap-2">
-                  @for (option of question.options; track option) {
+                  @for (option of q.options; track option) {
                     <div class="flex align-items-center gap-2">
                       <p-checkbox
                         [inputId]="option.value"
-                        [formControlName]="question.responseKey!"
+                        [formControlName]="q.responseKey!"
                         [value]="option.value"
                       ></p-checkbox>
                       <label [for]="option.value" class="ml-2">{{ option.label }}</label>
+                      @if (option.helpText) {
+                        <osf-info-icon [tooltipText]="option.helpText"></osf-info-icon>
+                      }
                     </div>
                   }
                 </div>
                 @if (
-                  stepForm.controls[question.responseKey!].errors?.['required'] &&
-                  (stepForm.controls[question.responseKey!].touched || stepForm.controls[question.responseKey!].dirty)
+                  stepForm.controls[q.responseKey!].errors?.['required'] &&
+                  (stepForm.controls[q.responseKey!].touched || stepForm.controls[q.responseKey!].dirty)
                 ) {
                   <p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small">
                     {{ INPUT_VALIDATION_MESSAGES.required | translate }}
@@ -129,15 +130,15 @@ <h3 class="mb-2">
 
               @case (FieldType.Text) {
                 <input
-                  [formControlName]="question.responseKey!"
+                  [formControlName]="q.responseKey!"
                   type="text"
                   class="w-full"
-                  [placeholder]="question.exampleText"
+                  [placeholder]="q.exampleText"
                   pInputText
                 />
                 @if (
-                  stepForm.controls[question.responseKey!].errors?.['required'] &&
-                  (stepForm.controls[question.responseKey!].touched || stepForm.controls[question.responseKey!].dirty)
+                  stepForm.controls[q.responseKey!].errors?.['required'] &&
+                  (stepForm.controls[q.responseKey!].touched || stepForm.controls[q.responseKey!].dirty)
                 ) {
                   <p-message class="simple-variant flex mt-1" severity="error" variant="simple" size="small">
                     {{ INPUT_VALIDATION_MESSAGES.required | translate }}
@@ -153,22 +154,22 @@ <h3 class="mb-2">{{ 'project.files.actions.uploadFile' | translate }}</h3>
                   {{ 'shared.files.description' | translate }}
                 </p>
                 <div class="flex flex-wrap gap-2 mt-3 mb-3">
-                  @for (file of attachedFiles[question.responseKey!] || []; track file) {
+                  @for (file of attachedFiles[q.responseKey!] || []; track file) {
                     <p-chip
                       [label]="file.name"
                       severity="info"
                       removable="true"
-                      (onRemove)="removeFromAttachedFiles(file, question.responseKey!)"
+                      (onRemove)="removeFromAttachedFiles(file, q.responseKey!)"
                     />
                   }
                 </div>
                 <div class="-ml-3 -mr-3">
                   <osf-files-control
-                    [attachedFiles]="attachedFiles[question.responseKey!]"
+                    [attachedFiles]="attachedFiles[q.responseKey!]"
                     [filesLink]="filesLink()"
                     [projectId]="projectId()"
                     [provider]="provider()"
-                    (attachFile)="onAttachFile($event, question.responseKey!)"
+                    (attachFile)="onAttachFile($event, q.responseKey!)"
                     [filesViewOnly]="filesViewOnly()"
                   ></osf-files-control>
                 </div>
diff --git a/src/app/features/registries/components/custom-step/custom-step.component.ts b/src/app/features/registries/components/custom-step/custom-step.component.ts
index dfca7e7ca..ac5fb6317 100644
--- a/src/app/features/registries/components/custom-step/custom-step.component.ts
+++ b/src/app/features/registries/components/custom-step/custom-step.component.ts
@@ -115,7 +115,11 @@ export class CustomStepComponent implements OnDestroy {
 
   private initStepForm(page: PageSchema): void {
     this.stepForm = this.fb.group({});
-    page.questions?.forEach((q) => {
+    let questions = page.questions || [];
+    if (page.sections?.length) {
+      questions = page.sections.flatMap((section) => section.questions || []);
+    }
+    questions?.forEach((q) => {
       const controlName = q.responseKey as string;
       let control: FormControl;
 
@@ -183,8 +187,11 @@ export class CustomStepComponent implements OnDestroy {
       this.stepForm.patchValue({
         [questionKey]: [...(this.attachedFiles[questionKey] || []), file],
       });
+      const otherFormValues = { ...this.stepForm.value };
+      delete otherFormValues[questionKey];
       this.updateAction.emit({
         [questionKey]: [...this.attachedFiles[questionKey].map((f) => FilesMapper.toFilePayload(f as OsfFile))],
+        ...otherFormValues,
       });
     }
   }
diff --git a/src/app/features/registries/components/justification-review/justification-review.component.html b/src/app/features/registries/components/justification-review/justification-review.component.html
index 90e09845a..f96c79cc7 100644
--- a/src/app/features/registries/components/justification-review/justification-review.component.html
+++ b/src/app/features/registries/components/justification-review/justification-review.component.html
@@ -28,50 +28,25 @@ <h2 class="mb-4">{{ page.title }}</h2>
       @if (page.description) {
         <p class="mb-4">{{ page.description }}</p>
       }
-
-      @if (page.questions?.length) {
-        @for (question of page.questions; track question.responseKey) {
-          <div [class.mb-4]="!$last">
-            <h4 class="mb-2">{{ question.displayText }}</h4>
-            @if (schemaResponseRevisionData()[question.responseKey!]) {
-              @switch (question.fieldType) {
-                @case (FieldType.Text) {
-                  <p>{{ schemaResponseRevisionData()[question.responseKey!] }}</p>
-                }
-                @case (FieldType.Checkbox) {
-                  @for (option of schemaResponseRevisionData()[question.responseKey!]; track option) {
-                    <p class="mb-1">{{ option }}</p>
-                  }
-                }
-                @case (FieldType.File) {
-                  @if (schemaResponseRevisionData()[question.responseKey!].length) {
-                    <div class="flex flex-wrap gap-2">
-                      @for (file of schemaResponseRevisionData()[question.responseKey!]; track file.id) {
-                        <p-tag [value]="file.file_name" severity="info"></p-tag>
-                      }
-                    </div>
-                  } @else {
-                    <p class="font-italic">{{ 'common.labels.noFiles' | translate }}</p>
-                  }
-                }
-                @default {
-                  <p>{{ schemaResponseRevisionData()[question.responseKey!] }}</p>
-                }
-              }
-            } @else {
-              @if (question.fieldType === FieldType.File) {
-                <p class="font-italic">{{ 'common.labels.noFiles' | translate }}</p>
-              } @else {
-                <p class="font-italic">{{ 'common.labels.noData' | translate }}</p>
-              }
-              @if (question.required) {
-                <p-message class="mt-1" severity="error" variant="simple" size="small">
-                  {{ INPUT_VALIDATION_MESSAGES.required | translate }}
-                </p-message>
-              }
+      @if (page.sections?.length) {
+        @for (section of page.sections; track section.id) {
+          <div class="mb-4">
+            <h3 class="mb-2">{{ section.title }}</h3>
+            @if (section.description) {
+              <p class="mb-4">{{ section.description }}</p>
+            }
+            @if (section.questions?.length) {
+              <osf-review-data
+                [questions]="section.questions"
+                [reviewData]="schemaResponseRevisionData()"
+              ></osf-review-data>
             }
           </div>
         }
+      } @else {
+        @if (page.questions?.length) {
+          <osf-review-data [questions]="page.questions" [reviewData]="schemaResponseRevisionData()"></osf-review-data>
+        }
       }
     </p-card>
   }
diff --git a/src/app/features/registries/components/justification-review/justification-review.component.ts b/src/app/features/registries/components/justification-review/justification-review.component.ts
index c53729ed0..e23293427 100644
--- a/src/app/features/registries/components/justification-review/justification-review.component.ts
+++ b/src/app/features/registries/components/justification-review/justification-review.component.ts
@@ -6,7 +6,6 @@ import { Button } from 'primeng/button';
 import { Card } from 'primeng/card';
 import { DialogService } from 'primeng/dynamicdialog';
 import { Message } from 'primeng/message';
-import { Tag } from 'primeng/tag';
 
 import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -18,10 +17,11 @@ import { CustomConfirmationService, ToastService } from '@osf/shared/services';
 import { FieldType, SchemaActionTrigger } from '../../enums';
 import { DeleteSchemaResponse, HandleSchemaResponse, RegistriesSelectors } from '../../store';
 import { ConfirmContinueEditingDialogComponent } from '../confirm-continue-editing-dialog/confirm-continue-editing-dialog.component';
+import { ReviewDataComponent } from '../review-data/review-data.component';
 
 @Component({
   selector: 'osf-justification-review',
-  imports: [Button, Card, TranslatePipe, Tag, Message],
+  imports: [Button, Card, TranslatePipe, Message, ReviewDataComponent],
   templateUrl: './justification-review.component.html',
   styleUrl: './justification-review.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/features/registries/components/review-data/review-data.component.html b/src/app/features/registries/components/review-data/review-data.component.html
new file mode 100644
index 000000000..57e2f00b8
--- /dev/null
+++ b/src/app/features/registries/components/review-data/review-data.component.html
@@ -0,0 +1,44 @@
+@for (question of questions(); track question.responseKey) {
+  <div [class.mb-4]="!$last">
+    <h4 class="mb-2">{{ question.displayText }}</h4>
+    @if (reviewData()[question.responseKey!]) {
+      @switch (question.fieldType) {
+        @case (FieldType.Text) {
+          <p>{{ reviewData()[question.responseKey!] }}</p>
+        }
+        @case (FieldType.Checkbox) {
+          @for (option of reviewData()[question.responseKey!]; track option) {
+            <p class="mb-1">{{ option }}</p>
+          }
+        }
+        @case (FieldType.File) {
+          @if (reviewData()[question.responseKey!].length) {
+            <div class="flex flex-wrap gap-2">
+              @for (file of reviewData()[question.responseKey!]; track file.id) {
+                <p-tag [value]="file.file_name" severity="info"></p-tag>
+              }
+            </div>
+          } @else {
+            <p class="font-italic">{{ 'common.labels.noFiles' | translate }}</p>
+          }
+        }
+        @default {
+          <p>{{ reviewData()[question.responseKey!] }}</p>
+        }
+      }
+    } @else {
+      @if (question.fieldType === FieldType.File) {
+        <p class="font-italic">{{ 'common.labels.noFiles' | translate }}</p>
+      } @else if (question.fieldType === FieldType.Paragraph) {
+        <p>{{ question.paragraphText! | translate }}</p>
+      } @else {
+        <p class="font-italic">{{ 'common.labels.noData' | translate }}</p>
+      }
+      @if (question.required) {
+        <p-message class="mt-1" severity="error" variant="simple" size="small">
+          {{ INPUT_VALIDATION_MESSAGES.required | translate }}
+        </p-message>
+      }
+    }
+  </div>
+}
diff --git a/src/app/features/registries/components/review-data/review-data.component.scss b/src/app/features/registries/components/review-data/review-data.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/features/registries/components/review-data/review-data.component.spec.ts b/src/app/features/registries/components/review-data/review-data.component.spec.ts
new file mode 100644
index 000000000..835eab90c
--- /dev/null
+++ b/src/app/features/registries/components/review-data/review-data.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ReviewDataComponent } from './review-data.component';
+
+describe('ReviewDataComponent', () => {
+  let component: ReviewDataComponent;
+  let fixture: ComponentFixture<ReviewDataComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ReviewDataComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ReviewDataComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/features/registries/components/review-data/review-data.component.ts b/src/app/features/registries/components/review-data/review-data.component.ts
new file mode 100644
index 000000000..2b8c11c6d
--- /dev/null
+++ b/src/app/features/registries/components/review-data/review-data.component.ts
@@ -0,0 +1,26 @@
+import { TranslatePipe } from '@ngx-translate/core';
+
+import { Message } from 'primeng/message';
+import { Tag } from 'primeng/tag';
+
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
+
+import { INPUT_VALIDATION_MESSAGES } from '@osf/shared/constants';
+
+import { FieldType } from '../../enums';
+import { Question } from '../../models';
+
+@Component({
+  selector: 'osf-review-data',
+  imports: [Tag, TranslatePipe, Message],
+  templateUrl: './review-data.component.html',
+  styleUrl: './review-data.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class ReviewDataComponent {
+  questions = input<Question[]>();
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  reviewData = input<Record<string, any>>({});
+  protected readonly FieldType = FieldType;
+  protected readonly INPUT_VALIDATION_MESSAGES = INPUT_VALIDATION_MESSAGES;
+}
diff --git a/src/app/features/registries/components/review/review.component.html b/src/app/features/registries/components/review/review.component.html
index bc38e322a..5d8a02834 100644
--- a/src/app/features/registries/components/review/review.component.html
+++ b/src/app/features/registries/components/review/review.component.html
@@ -93,49 +93,22 @@ <h2 class="mb-4">{{ page.title }}</h2>
         <p class="mb-4">{{ page.description }}</p>
       }
 
-      @if (page.questions?.length) {
-        @for (question of page.questions; track question.responseKey) {
-          <div [class.mb-4]="!$last">
-            <h4 class="mb-2">{{ question.displayText }}</h4>
-            @if (stepsData()[question.responseKey!]) {
-              @switch (question.fieldType) {
-                @case (FieldType.Text) {
-                  <p>{{ stepsData()[question.responseKey!] }}</p>
-                }
-                @case (FieldType.Checkbox) {
-                  @for (option of stepsData()[question.responseKey!]; track option) {
-                    <p class="mb-1">{{ option }}</p>
-                  }
-                }
-                @case (FieldType.File) {
-                  @if (stepsData()[question.responseKey!].length) {
-                    <div class="flex flex-wrap gap-2">
-                      @for (file of stepsData()[question.responseKey!]; track file.id) {
-                        <p-tag [value]="file.file_name" severity="info"></p-tag>
-                      }
-                    </div>
-                  } @else {
-                    <p class="font-italic">{{ 'common.labels.noFiles' | translate }}</p>
-                  }
-                }
-                @default {
-                  <p>{{ stepsData()[question.responseKey!] }}</p>
-                }
-              }
-            } @else {
-              @if (question.fieldType === FieldType.File) {
-                <p class="font-italic">{{ 'common.labels.noFiles' | translate }}</p>
-              } @else {
-                <p class="font-italic">{{ 'common.labels.noData' | translate }}</p>
-              }
-              @if (question.required) {
-                <p-message class="mt-1" severity="error" variant="simple" size="small">
-                  {{ INPUT_VALIDATION_MESSAGES.required | translate }}
-                </p-message>
-              }
+      @if (page.sections?.length) {
+        @for (section of page.sections; track section.id) {
+          <div class="mb-4">
+            <h3 class="mb-2">{{ section.title }}</h3>
+            @if (section.description) {
+              <p class="mb-4">{{ section.description }}</p>
+            }
+            @if (section.questions?.length) {
+              <osf-review-data [questions]="section.questions" [reviewData]="stepsData()"></osf-review-data>
             }
           </div>
         }
+      } @else {
+        @if (page.questions?.length) {
+          <osf-review-data [questions]="page.questions" [reviewData]="stepsData()"></osf-review-data>
+        }
       }
     </p-card>
   }
diff --git a/src/app/features/registries/components/review/review.component.ts b/src/app/features/registries/components/review/review.component.ts
index 018f165aa..2489e0495 100644
--- a/src/app/features/registries/components/review/review.component.ts
+++ b/src/app/features/registries/components/review/review.component.ts
@@ -27,8 +27,9 @@ import {
 } from '@osf/shared/stores';
 
 import { FieldType } from '../../enums';
-import { DeleteDraft, FetchLicenses, FetchProjectChildren, RegistriesSelectors } from '../../store';
+import { ClearState, DeleteDraft, FetchLicenses, FetchProjectChildren, RegistriesSelectors } from '../../store';
 import { ConfirmRegistrationDialogComponent } from '../confirm-registration-dialog/confirm-registration-dialog.component';
+import { ReviewDataComponent } from '../review-data/review-data.component';
 import { SelectComponentsDialogComponent } from '../select-components-dialog/select-components-dialog.component';
 
 @Component({
@@ -45,6 +46,7 @@ import { SelectComponentsDialogComponent } from '../select-components-dialog/sel
     AccordionHeader,
     AccordionPanel,
     InterpolatePipe,
+    ReviewDataComponent,
   ],
   templateUrl: './review.component.html',
   styleUrl: './review.component.scss',
@@ -77,6 +79,7 @@ export class ReviewComponent {
     getContributors: GetAllContributors,
     getSubjects: FetchSelectedSubjects,
     deleteDraft: DeleteDraft,
+    clearState: ClearState,
     getProjectsComponents: FetchProjectChildren,
     fetchLicenses: FetchLicenses,
   });
@@ -131,10 +134,11 @@ export class ReviewComponent {
       headerKey: 'registries.deleteDraft',
       messageKey: 'registries.confirmDeleteDraft',
       onConfirm: () => {
+        const providerId = this.draftRegistration()?.providerId;
         this.actions.deleteDraft(this.draftId()).subscribe({
           next: () => {
-            // [NM] TODO: clear validation state
-            this.router.navigateByUrl(`/registries/${this.draftRegistration()?.providerId}new`);
+            this.actions.clearState();
+            this.router.navigateByUrl(`/registries/${providerId}/new`);
           },
         });
       },
diff --git a/src/app/features/registries/enums/field-type.enum.ts b/src/app/features/registries/enums/field-type.enum.ts
index 114128096..3e41aecb8 100644
--- a/src/app/features/registries/enums/field-type.enum.ts
+++ b/src/app/features/registries/enums/field-type.enum.ts
@@ -5,4 +5,5 @@ export enum FieldType {
   Checkbox = 'checkbox',
   Radio = 'radio',
   File = 'file',
+  Paragraph = 'paragraph',
 }
diff --git a/src/app/features/registries/mappers/page-schema.mapper.ts b/src/app/features/registries/mappers/page-schema.mapper.ts
index 3a60c6add..08fa5f8a5 100644
--- a/src/app/features/registries/mappers/page-schema.mapper.ts
+++ b/src/app/features/registries/mappers/page-schema.mapper.ts
@@ -36,6 +36,7 @@ export class PageSchemaMapper {
         case BlockType.Paragraph:
           if (currentQuestion) {
             currentQuestion.paragraphText = item.attributes.display_text;
+            currentQuestion.fieldType = FieldType.Paragraph;
           } else if (currentSection) {
             currentSection.description = item.attributes.display_text;
           } else {
diff --git a/src/app/features/registries/pages/my-registrations/my-registrations.component.ts b/src/app/features/registries/pages/my-registrations/my-registrations.component.ts
index e30ba8333..237b2995c 100644
--- a/src/app/features/registries/pages/my-registrations/my-registrations.component.ts
+++ b/src/app/features/registries/pages/my-registrations/my-registrations.component.ts
@@ -98,8 +98,10 @@ export class MyRegistrationsComponent {
       const tab = this.selectedTab();
 
       if (tab === 0) {
+        this.draftFirst = 0;
         this.actions.getDraftRegistrations();
       } else {
+        this.submittedFirst = 0;
         this.actions.getSubmittedRegistrations();
       }
       this.router.navigate([], {
diff --git a/src/app/features/registries/services/licenses.service.ts b/src/app/features/registries/services/licenses.service.ts
index 6fbbdef10..1e1008aef 100644
--- a/src/app/features/registries/services/licenses.service.ts
+++ b/src/app/features/registries/services/licenses.service.ts
@@ -17,25 +17,6 @@ import { LicensesMapper } from '../mappers';
 
 import { environment } from 'src/environments/environment';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const data: any = {
-  data: [
-    {
-      id: '58fd62fdda3e2400012ca5d9',
-      type: 'licenses',
-      attributes: {
-        name: 'MIT License',
-        text: 'The MIT License (MIT)\n\nCopyright (c) {{year}} {{copyrightHolders}}\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n',
-        url: 'http://opensource.org/licenses/MIT',
-        required_fields: ['year', 'copyrightHolders'],
-      },
-      links: {
-        self: 'https://api.test.osf.io/v2/licenses/58fd62fdda3e2400012ca5d9/',
-      },
-    },
-  ],
-};
-
 @Injectable()
 export class LicensesService {
   private apiUrl = environment.apiUrl;
@@ -50,7 +31,6 @@ export class LicensesService {
       })
       .pipe(
         map((licenses) => {
-          licenses.data.unshift(data.data[0]); // For testing purposes, remove in production
           return LicensesMapper.fromLicensesResponse(licenses);
         })
       );
diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.html b/src/app/features/registry/components/registry-statuses/registry-statuses.component.html
index 7aa6a3204..b4a1404b6 100644
--- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.html
+++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.html
@@ -7,7 +7,7 @@
       <div class="flex flex-column pt-4 gap-2">
         <h2 class="font-normal">{{ 'registry.overview.statuses.' + registry()?.status + '.short' | translate }}</h2>
         <p>{{ 'registry.overview.statuses.' + registry()?.status + '.long' | translate }}</p>
-        @if (registry()?.status === RegistryStatus.InProgress && registry()?.status === RegistryStatus.Accepted) {
+        @if (canWithdraw) {
           <p-button
             (click)="openWithdrawDialog()"
             [label]="'registry.overview.withdrawRegistration' | translate"
diff --git a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts
index 76a7b76bf..9ffeeddda 100644
--- a/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts
+++ b/src/app/features/registry/components/registry-statuses/registry-statuses.component.ts
@@ -11,6 +11,7 @@ import { ChangeDetectionStrategy, Component, HostBinding, inject, input } from '
 import { WithdrawDialogComponent } from '@osf/features/registry/components';
 import { RegistryOverview } from '@osf/features/registry/models';
 import { MakePublic } from '@osf/features/registry/store/registry-overview';
+import { RegistrationReviewStates, RevisionReviewStates } from '@osf/shared/enums';
 import { RegistryStatus } from '@shared/enums';
 import { CustomConfirmationService } from '@shared/services';
 
@@ -28,11 +29,19 @@ export class RegistryStatusesComponent {
   private readonly dialogService = inject(DialogService);
   private readonly translateService = inject(TranslateService);
   protected readonly RegistryStatus = RegistryStatus;
+  protected readonly RevisionReviewStates = RevisionReviewStates;
   protected readonly customConfirmationService = inject(CustomConfirmationService);
   protected readonly actions = createDispatchMap({
     makePublic: MakePublic,
   });
 
+  get canWithdraw(): boolean {
+    return (
+      this.registry()?.reviewsState === RegistrationReviewStates.Accepted &&
+      this.registry()?.revisionStatus === RevisionReviewStates.RevisionPendingModeration
+    );
+  }
+
   openWithdrawDialog(): void {
     const registry = this.registry();
     if (registry) {
diff --git a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.html b/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.html
index 6d95fc1dd..83a7fbf94 100644
--- a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.html
+++ b/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.html
@@ -5,6 +5,7 @@
     [control]="form.controls['text']"
     [label]="'registry.overview.withdrawJustificationLabel' | translate"
     [placeholder]="'common.labels.optional' | translate"
+    [maxLength]="inputLimits.fullName.maxLength"
   >
   </osf-text-input>
 
diff --git a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts b/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts
index bf0471cc5..37f7e7299 100644
--- a/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts
+++ b/src/app/features/registry/components/withdraw-dialog/withdraw-dialog.component.ts
@@ -11,6 +11,7 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 
 import { WithdrawRegistration } from '@osf/features/registry/store/registry-overview';
+import { InputLimits } from '@osf/shared/constants';
 import { TextInputComponent } from '@shared/components';
 
 @Component({
@@ -30,6 +31,7 @@ export class WithdrawDialogComponent {
   protected readonly form = new FormGroup({
     text: new FormControl(''),
   });
+  protected readonly inputLimits = InputLimits;
 
   withdrawRegistration(): void {
     const registryId = this.config.data.registryId;
diff --git a/src/app/features/registry/mappers/registry-metadata.mapper.ts b/src/app/features/registry/mappers/registry-metadata.mapper.ts
index d94a07ef1..546e2bdde 100644
--- a/src/app/features/registry/mappers/registry-metadata.mapper.ts
+++ b/src/app/features/registry/mappers/registry-metadata.mapper.ts
@@ -1,5 +1,5 @@
 import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
-import { RegistryStatus, RevisionReviewStates } from '@shared/enums';
+import { RegistrationReviewStates, RegistryStatus, RevisionReviewStates } from '@shared/enums';
 import { License } from '@shared/models';
 
 import {
@@ -110,6 +110,7 @@ export class RegistryMetadataMapper {
       schemaResponses: [],
       status: attributes['status'] as RegistryStatus,
       revisionStatus: attributes['revision_status'] as RevisionReviewStates,
+      reviewsState: attributes['reviews_state'] as RegistrationReviewStates,
       links: {
         files: '',
       },
diff --git a/src/app/features/registry/mappers/registry-overview.mapper.ts b/src/app/features/registry/mappers/registry-overview.mapper.ts
index 484556521..4a4047c9e 100644
--- a/src/app/features/registry/mappers/registry-overview.mapper.ts
+++ b/src/app/features/registry/mappers/registry-overview.mapper.ts
@@ -62,6 +62,7 @@ export function MapRegistryOverview(data: RegistryOverviewJsonApiData): Registry
     })),
     status: MapRegistryStatus(data.attributes),
     revisionStatus: data.attributes.revision_state,
+    reviewsState: data.attributes.reviews_state,
     links: {
       files: data?.embeds?.files?.data?.[0]?.relationships?.files?.links?.related?.href,
     },
diff --git a/src/app/features/registry/models/registry-overview.models.ts b/src/app/features/registry/models/registry-overview.models.ts
index b9c34528a..ec83cbe82 100644
--- a/src/app/features/registry/models/registry-overview.models.ts
+++ b/src/app/features/registry/models/registry-overview.models.ts
@@ -1,6 +1,6 @@
 import { ProjectOverviewContributor } from '@osf/features/project/overview/models';
 import { RegistrationQuestions, RegistrySubject } from '@osf/features/registry/models';
-import { RegistryStatus, RevisionReviewStates } from '@shared/enums';
+import { RegistrationReviewStates, RegistryStatus, RevisionReviewStates } from '@shared/enums';
 import { License } from '@shared/models';
 
 export interface RegistryOverview {
@@ -59,6 +59,7 @@ export interface RegistryOverview {
   }[];
   status: RegistryStatus;
   revisionStatus: RevisionReviewStates;
+  reviewsState?: RegistrationReviewStates;
   links: {
     files: string;
   };