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 e6ed1032c..a8cdbc290 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
@@ -10,6 +10,10 @@ <h2>{{ currentPage().title }}</h2>
       }
     </div>
 
+    @if (currentPage().description?.length) {
+      <p class="preserve-whitespace">{{ currentPage().description }}</p>
+    }
+
     @let questions = currentPage().questions || [];
 
     <ng-container *ngTemplateOutlet="questionList; context: { $implicit: questions }"></ng-container>
@@ -47,10 +51,10 @@ <h3 class="mb-2">
                 </h3>
               </div>
               @if (q.paragraphText) {
-                <p class="mb-3">{{ q.paragraphText }}</p>
+                <p class="mb-3 preserve-whitespace">{{ q.paragraphText }}</p>
               }
-              @if (q.helpText && q.fieldType !== FieldType.Radio && q.fieldType !== FieldType.Checkbox) {
-                <p>{{ q.helpText }}</p>
+              @if (q.helpText) {
+                <p class="preserve-whitespace">{{ q.helpText }}</p>
               }
             </label>
             @if (q.exampleText) {
@@ -87,7 +91,7 @@ <h3 class="mb-2">
                 }
               }
               @case (FieldType.Radio) {
-                <div class="flex flex-column gap-2">
+                <div class="flex flex-column gap-2 mt-3">
                   @for (option of q.options; track option) {
                     <div class="flex align -items-center gap-2">
                       <p-radioButton
@@ -95,7 +99,8 @@ <h3 class="mb-2">
                         [inputId]="option.value"
                         [value]="option.value"
                       ></p-radioButton>
-                      <label [for]="option.value" class="ml-2">{{ option.label }}</label>
+
+                      <label [for]="option.value" class="mb-0 cursor-pointer">{{ option.label }}</label>
                       @if (option.helpText) {
                         <osf-info-icon [tooltipText]="option.helpText" tooltipPosition="top"></osf-info-icon>
                       }
@@ -112,7 +117,7 @@ <h3 class="mb-2">
                 }
               }
               @case (FieldType.Checkbox) {
-                <div class="flex flex-column gap-2">
+                <div class="flex flex-column gap-2 mt-3">
                   @for (option of q.options; track option) {
                     <div class="flex align-items-center gap-2">
                       <p-checkbox
@@ -120,7 +125,8 @@ <h3 class="mb-2">
                         [formControlName]="q.responseKey!"
                         [value]="option.value"
                       ></p-checkbox>
-                      <label [for]="option.value" class="ml-2">{{ option.label }}</label>
+
+                      <label [for]="option.value" class="mb-0 cursor-pointer">{{ option.label }}</label>
                       @if (option.helpText) {
                         <osf-info-icon [tooltipText]="option.helpText" tooltipPosition="top"></osf-info-icon>
                       }
@@ -190,13 +196,14 @@ <h3 class="mb-2">{{ 'files.actions.uploadFile' | translate }}</h3>
       [label]="'common.buttons.back' | translate"
       severity="info"
       class="mr-2"
-      (click)="goBack()"
+      (onClick)="goBack()"
     ></p-button>
+
     <p-button
       data-test-goto-next-page
       type="button"
       [label]="'common.buttons.next' | translate"
-      (click)="goNext()"
+      (onClick)="goNext()"
     ></p-button>
   </div>
 </section>
diff --git a/src/app/features/registries/components/drafts/drafts.component.ts b/src/app/features/registries/components/drafts/drafts.component.ts
index f012077bd..4c4c4c04f 100644
--- a/src/app/features/registries/components/drafts/drafts.component.ts
+++ b/src/app/features/registries/components/drafts/drafts.component.ts
@@ -122,9 +122,7 @@ export class DraftsComponent implements OnDestroy {
     this.route.snapshot.firstChild?.params['step'] ? +this.route.snapshot.firstChild?.params['step'] : 0
   );
 
-  currentStep = computed(() => {
-    return this.steps()[this.currentStepIndex()];
-  });
+  currentStep = computed(() => this.steps()[this.currentStepIndex()]);
 
   registrationId = this.route.snapshot.firstChild?.params['id'] || '';
 
diff --git a/src/app/features/registries/components/review/review.component.html b/src/app/features/registries/components/review/review.component.html
index f984826f5..691afff6c 100644
--- a/src/app/features/registries/components/review/review.component.html
+++ b/src/app/features/registries/components/review/review.component.html
@@ -82,7 +82,7 @@ <h4 class="mb-2">{{ 'shared.tags.title' | translate }}</h4>
       <h2 class="mb-4">{{ page.title }}</h2>
 
       @if (page.description) {
-        <p class="mb-4">{{ page.description }}</p>
+        <p class="mb-4 preserve-whitespace">{{ page.description }}</p>
       }
 
       @if (page.sections?.length) {
@@ -90,7 +90,7 @@ <h2 class="mb-4">{{ page.title }}</h2>
           <div class="mb-4">
             <h3 class="mb-2">{{ section.title }}</h3>
             @if (section.description) {
-              <p class="mb-4">{{ section.description }}</p>
+              <p class="mb-4 preserve-whitespace">{{ section.description }}</p>
             }
             @if (section.questions?.length) {
               <osf-registration-blocks-data
diff --git a/src/app/features/registries/store/registries.state.ts b/src/app/features/registries/store/registries.state.ts
index 21308884b..95addb8eb 100644
--- a/src/app/features/registries/store/registries.state.ts
+++ b/src/app/features/registries/store/registries.state.ts
@@ -245,6 +245,7 @@ export class RegistriesState {
     ctx.patchState({
       pagesSchema: { ...state.pagesSchema, isLoading: true, error: null },
     });
+
     return this.registriesService.getSchemaBlocks(action.registrationSchemaId).pipe(
       tap((schemaBlocks) => {
         ctx.patchState({