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 a8cdbc290..872da1b1d 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
@@ -30,7 +30,7 @@ <h3 class="mb-2">{{ section.title }}</h3>
           </div>
 
           @if (section.description) {
-            <p class="mb-3">{{ section.description }}</p>
+            <p class="preserve-whitespace mb-3">{{ section.description }}</p>
           }
           <ng-container *ngTemplateOutlet="questionList; context: { $implicit: section.questions }"></ng-container>
         </p-card>
@@ -40,151 +40,150 @@ <h3 class="mb-2">{{ section.title }}</h3>
     <ng-template #questionList let-questions>
       @for (q of questions; track q.id) {
         <form class="mb-4" [formGroup]="stepForm">
-          <p-card>
-            <label [for]="q.groupKey">
-              <div class="flex align-items-baseline gap-1">
-                <h3 class="mb-2">
-                  {{ q.displayText }}
-                  @if (q.required) {
-                    <span class="text-red-500">*</span>
-                  }
-                </h3>
-              </div>
-              @if (q.paragraphText) {
-                <p class="mb-3 preserve-whitespace">{{ q.paragraphText }}</p>
-              }
-              @if (q.helpText) {
-                <p class="preserve-whitespace">{{ q.helpText }}</p>
-              }
-            </label>
-            @if (q.exampleText) {
-              <p-inplace #inplaceRef styleClass="mb-4">
-                <ng-template #display>
-                  <span class="text-primary font-medium">{{ 'common.links.showExample' | translate }} </span>
-                </ng-template>
-                <ng-template #content>
-                  <p-button size="small" (onClick)="inplaceRef.deactivate()" variant="text" styleClass="font-medium">
-                    {{ 'common.links.hideExample' | translate }}
-                  </p-button>
-                  <p class="m-0">{{ q.exampleText }}</p>
-                </ng-template>
-              </p-inplace>
+          <label [for]="q.groupKey">
+            <div class="flex align-items-baseline gap-1">
+              <h3 class="mb-2">
+                {{ q.displayText }}
+                @if (q.required) {
+                  <span class="text-red-500">*</span>
+                }
+              </h3>
+            </div>
+            @if (q.paragraphText) {
+              <p class="mb-3 preserve-whitespace">{{ q.paragraphText }}</p>
+            }
+            @if (q.helpText) {
+              <p class="preserve-whitespace">{{ q.helpText }}</p>
             }
+          </label>
 
-            @switch (q.fieldType) {
-              @case (FieldType.TextArea) {
-                <textarea
-                  id="{{ q.groupKey }}"
-                  class="w-full"
-                  rows="5"
-                  cols="30"
-                  pTextarea
-                  [formControlName]="q.responseKey!"
-                ></textarea>
-                @if (
-                  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 }}
-                  </p-message>
-                }
-              }
-              @case (FieldType.Radio) {
-                <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
-                        [formControlName]="q.responseKey!"
-                        [inputId]="option.value"
-                        [value]="option.value"
-                      ></p-radioButton>
-
-                      <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>
-                      }
-                    </div>
-                  }
-                </div>
-                @if (
-                  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 }}
-                  </p-message>
-                }
+          @if (q.exampleText) {
+            <p-inplace #inplaceRef styleClass="mb-4">
+              <ng-template #display>
+                <span class="text-primary font-medium">{{ 'common.links.showExample' | translate }} </span>
+              </ng-template>
+              <ng-template #content>
+                <p-button size="small" (onClick)="inplaceRef.deactivate()" variant="text" styleClass="font-medium">
+                  {{ 'common.links.hideExample' | translate }}
+                </p-button>
+                <p class="m-0">{{ q.exampleText }}</p>
+              </ng-template>
+            </p-inplace>
+          }
+
+          @switch (q.fieldType) {
+            @case (FieldType.TextArea) {
+              <textarea
+                id="{{ q.groupKey }}"
+                class="w-full"
+                rows="5"
+                cols="30"
+                pTextarea
+                [formControlName]="q.responseKey!"
+              ></textarea>
+              @if (
+                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 }}
+                </p-message>
               }
-              @case (FieldType.Checkbox) {
-                <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
-                        [inputId]="option.value"
-                        [formControlName]="q.responseKey!"
-                        [value]="option.value"
-                      ></p-checkbox>
-
-                      <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>
-                      }
-                    </div>
-                  }
-                </div>
-                @if (
-                  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 }}
-                  </p-message>
+            }
+            @case (FieldType.Radio) {
+              <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
+                      [formControlName]="q.responseKey!"
+                      [inputId]="option.value"
+                      [value]="option.value"
+                    ></p-radioButton>
+
+                    <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>
+                    }
+                  </div>
                 }
+              </div>
+              @if (
+                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 }}
+                </p-message>
               }
+            }
+            @case (FieldType.Checkbox) {
+              <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
+                      [inputId]="option.value"
+                      [formControlName]="q.responseKey!"
+                      [value]="option.value"
+                    ></p-checkbox>
 
-              @case (FieldType.Text) {
-                <input [formControlName]="q.responseKey!" type="text" class="w-full" pInputText />
-                @if (
-                  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 }}
-                  </p-message>
+                    <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>
+                    }
+                  </div>
                 }
+              </div>
+              @if (
+                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 }}
+                </p-message>
               }
-              @case (FieldType.File) {
-                <h3 class="mb-2">{{ 'files.actions.uploadFile' | translate }}</h3>
-                <p class="mb-1">
-                  {{ 'shared.files.limitText' | translate }}
-                </p>
-                <p>
-                  {{ 'shared.files.description' | translate }}
-                </p>
-                <div class="flex flex-wrap gap-2 mt-3 mb-3">
-                  @for (file of attachedFiles[q.responseKey!] || []; track file) {
-                    <p-chip
-                      [label]="file.name"
-                      severity="info"
-                      removable="true"
-                      (onRemove)="removeFromAttachedFiles(file, q.responseKey!)"
-                    />
-                  }
-                </div>
-                <div class="-ml-3 -mr-3">
-                  <osf-files-control
-                    [attachedFiles]="attachedFiles[q.responseKey!]"
-                    [filesLink]="filesLink()"
-                    [projectId]="projectId()"
-                    [provider]="provider()"
-                    (attachFile)="onAttachFile($event, q.responseKey!)"
-                    [filesViewOnly]="filesViewOnly()"
-                  ></osf-files-control>
-                </div>
+            }
+
+            @case (FieldType.Text) {
+              <input [formControlName]="q.responseKey!" type="text" class="w-full" pInputText />
+              @if (
+                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 }}
+                </p-message>
               }
             }
-          </p-card>
+            @case (FieldType.File) {
+              <h3 class="mb-2">{{ 'files.actions.uploadFile' | translate }}</h3>
+              <p class="mb-1">
+                {{ 'shared.files.limitText' | translate }}
+              </p>
+              <p>
+                {{ 'shared.files.description' | translate }}
+              </p>
+              <div class="flex flex-wrap gap-2 mt-3 mb-3">
+                @for (file of attachedFiles[q.responseKey!] || []; track file) {
+                  <p-chip
+                    [label]="file.name"
+                    severity="info"
+                    removable="true"
+                    (onRemove)="removeFromAttachedFiles(file, q.responseKey!)"
+                  />
+                }
+              </div>
+              <div class="-ml-3 -mr-3">
+                <osf-files-control
+                  [attachedFiles]="attachedFiles[q.responseKey!]"
+                  [filesLink]="filesLink()"
+                  [projectId]="projectId()"
+                  [provider]="provider()"
+                  (attachFile)="onAttachFile($event, q.responseKey!)"
+                  [filesViewOnly]="filesViewOnly()"
+                ></osf-files-control>
+              </div>
+            }
+          }
         </form>
       }
     </ng-template>
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 5f8c45cda..480466477 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
@@ -1,7 +1,8 @@
-<section class="flex flex-column flex-1 bg-white p-5 gap-4 w-full">
+<section class="flex flex-column flex-1 bg-white p-3 md:p-4 gap-4 w-full">
   <p-card>
     <h2 class="mb-4">{{ 'registries.justification.step' | translate }}</h2>
     <h4 class="mb-2">{{ 'registries.justification.title' | translate }}</h4>
+
     @if (schemaResponse()?.revisionJustification) {
       <p class="mb-2">{{ schemaResponse()?.revisionJustification }}</p>
     } @else {
@@ -12,7 +13,9 @@ <h4 class="mb-2">{{ 'registries.justification.title' | translate }}</h4>
         </p-message>
       </div>
     }
+
     <h4 class="mb-2">{{ 'registries.justification.updatedList' | translate }}</h4>
+
     @if (changes().length) {
       @for (item of changes(); track item) {
         <p class="mb-1">{{ item }}</p>
@@ -21,6 +24,7 @@ <h4 class="mb-2">{{ 'registries.justification.updatedList' | translate }}</h4>
       <p class="font-italic text-red-500">{{ 'registries.justification.noUpdates' | translate }}</p>
     }
   </p-card>
+
   @for (page of pages(); track page.id) {
     <p-card class="w-full">
       <h2 class="mb-4">{{ page.title }}</h2>
@@ -28,6 +32,14 @@ <h2 class="mb-4">{{ page.title }}</h2>
       @if (page.description) {
         <p class="mb-4">{{ page.description }}</p>
       }
+
+      @if (page.questions?.length) {
+        <osf-registration-blocks-data
+          [questions]="page.questions"
+          [reviewData]="schemaResponseRevisionData()"
+        ></osf-registration-blocks-data>
+      }
+
       @if (page.sections?.length) {
         @for (section of page.sections; track section.id) {
           <div class="mb-4">
@@ -43,51 +55,39 @@ <h3 class="mb-2">{{ section.title }}</h3>
             }
           </div>
         }
-      } @else {
-        @if (page.questions?.length) {
-          <osf-registration-blocks-data
-            [questions]="page.questions"
-            [reviewData]="schemaResponseRevisionData()"
-          ></osf-registration-blocks-data>
-        }
       }
     </p-card>
   }
-  <div>
-    <div class="flex justify-content-end">
-      @if (inProgress) {
-        <p-button
-          [label]="'common.buttons.back' | translate"
-          severity="info"
-          class="mr-2"
-          (click)="goBack()"
-        ></p-button>
-        <p-button
-          [label]="'registries.justification.deleteUpdates' | translate"
-          severity="danger"
-          (click)="deleteDraftUpdate()"
-          class="mr-2"
-        >
-        </p-button>
-        <p-button
-          [label]="'registries.justification.submitChanges' | translate"
-          [disabled]="!changes().length"
-          (click)="submit()"
-          [loading]="isSchemaResponseLoading()"
-        ></p-button>
-      } @else if (isUnapproved) {
-        <p-button
-          [label]="'registries.justification.acceptChanges' | translate"
-          severity="success"
-          class="mr-2"
-          (click)="acceptChanges()"
-          [loading]="isSchemaResponseLoading()"
-        ></p-button>
-        <p-button
-          [label]="'registries.justification.continueEditing' | translate"
-          (click)="continueEditing()"
-        ></p-button>
-      }
-    </div>
+
+  <div class="flex flex-wrap justify-content-end gap-3">
+    @if (inProgress) {
+      <p-button [label]="'common.buttons.back' | translate" severity="info" (onClick)="goBack()"></p-button>
+
+      <p-button
+        [label]="'registries.justification.deleteUpdates' | translate"
+        severity="danger"
+        (onClick)="deleteDraftUpdate()"
+      >
+      </p-button>
+
+      <p-button
+        [label]="'registries.justification.submitChanges' | translate"
+        [disabled]="!changes().length"
+        (onClick)="submit()"
+        [loading]="isSchemaResponseLoading()"
+      ></p-button>
+    } @else if (isUnapproved) {
+      <p-button
+        [label]="'registries.justification.acceptChanges' | translate"
+        severity="success"
+        (onClick)="acceptChanges()"
+        [loading]="isSchemaResponseLoading()"
+      ></p-button>
+
+      <p-button
+        [label]="'registries.justification.continueEditing' | translate"
+        (onClick)="continueEditing()"
+      ></p-button>
+    }
   </div>
 </section>
diff --git a/src/app/features/registries/components/review/review.component.html b/src/app/features/registries/components/review/review.component.html
index 691afff6c..5f7c247bf 100644
--- a/src/app/features/registries/components/review/review.component.html
+++ b/src/app/features/registries/components/review/review.component.html
@@ -13,6 +13,7 @@ <h4 class="mb-2">{{ 'common.labels.title' | translate }}</h4>
         </p-message>
       }
     </div>
+
     <div class="mb-4">
       <h4 class="mb-2">{{ 'common.labels.description' | translate }}</h4>
       <p data-test-review-response="description">{{ draftRegistration()?.description }}</p>
@@ -50,6 +51,7 @@ <h4 class="mb-2">{{ 'shared.license.title' | translate }}</h4>
         </p-message>
       }
     </div>
+
     <div class="mb-4">
       <h4 class="mb-2">{{ 'shared.subjects.title' | translate }}</h4>
       <div class="flex flex-wrap gap-2">
@@ -57,6 +59,7 @@ <h4 class="mb-2">{{ 'shared.subjects.title' | translate }}</h4>
           <p-tag data-test-selected-subject [value]="subject.name" severity="info" />
         }
       </div>
+
       @if (!subjects().length) {
         <p class="font-italic">{{ 'common.labels.noData' | translate }}</p>
         <p-message class="mt-1" severity="error" variant="simple" size="small">
@@ -77,6 +80,7 @@ <h4 class="mb-2">{{ 'shared.tags.title' | translate }}</h4>
       }
     </div>
   </p-card>
+
   @for (page of pages(); track page.id) {
     <p-card class="w-full">
       <h2 class="mb-4">{{ page.title }}</h2>
@@ -85,6 +89,14 @@ <h2 class="mb-4">{{ page.title }}</h2>
         <p class="mb-4 preserve-whitespace">{{ page.description }}</p>
       }
 
+      @if (page.questions?.length) {
+        <osf-registration-blocks-data
+          [isDraft]="true"
+          [questions]="page.questions"
+          [reviewData]="stepsData()"
+        ></osf-registration-blocks-data>
+      }
+
       @if (page.sections?.length) {
         @for (section of page.sections; track section.id) {
           <div class="mb-4">
@@ -101,14 +113,6 @@ <h3 class="mb-2">{{ section.title }}</h3>
             }
           </div>
         }
-      } @else {
-        @if (page.questions?.length) {
-          <osf-registration-blocks-data
-            [isDraft]="true"
-            [questions]="page.questions"
-            [reviewData]="stepsData()"
-          ></osf-registration-blocks-data>
-        }
       }
     </p-card>
   }
diff --git a/src/app/features/registry/pages/registry-overview/registry-overview.component.html b/src/app/features/registry/pages/registry-overview/registry-overview.component.html
index 387f1f2a6..55714a2c2 100644
--- a/src/app/features/registry/pages/registry-overview/registry-overview.component.html
+++ b/src/app/features/registry/pages/registry-overview/registry-overview.component.html
@@ -93,7 +93,18 @@ <h4 class="mb-1">
               <h2 class="mb-4 text-xl">{{ page.title }}</h2>
 
               @if (page.description) {
-                <p class="mb-4">{{ page.description }}</p>
+                <p class="preserve-whitespace mb-4">{{ page.description }}</p>
+              }
+
+              @if (page.questions?.length) {
+                <osf-registration-blocks-data
+                  [class.mb-4]="!$last"
+                  [questions]="page.questions"
+                  [reviewData]="schemaResponse()?.revisionResponses || {}"
+                  [isOverviewPage]="true"
+                  [updatedFields]="updatedFields()"
+                  [isOriginalRevision]="schemaResponse()?.isOriginalResponse!"
+                ></osf-registration-blocks-data>
               }
 
               @if (page.sections?.length) {
@@ -101,7 +112,7 @@ <h2 class="mb-4 text-xl">{{ 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="preserve-whitespace mb-4">{{ section.description }}</p>
                     }
                     @if (section.questions?.length) {
                       <osf-registration-blocks-data
@@ -115,17 +126,6 @@ <h3 class="mb-2">{{ section.title }}</h3>
                     }
                   </div>
                 }
-              } @else {
-                @if (page.questions?.length) {
-                  <osf-registration-blocks-data
-                    [class.mb-4]="!$last"
-                    [questions]="page.questions"
-                    [reviewData]="schemaResponse()?.revisionResponses || {}"
-                    [isOverviewPage]="true"
-                    [updatedFields]="updatedFields()"
-                    [isOriginalRevision]="schemaResponse()?.isOriginalResponse!"
-                  ></osf-registration-blocks-data>
-                }
               }
             }
           </div>
diff --git a/src/app/shared/components/registration-blocks-data/registration-blocks-data.component.html b/src/app/shared/components/registration-blocks-data/registration-blocks-data.component.html
index f6c8241ba..ec75249f2 100644
--- a/src/app/shared/components/registration-blocks-data/registration-blocks-data.component.html
+++ b/src/app/shared/components/registration-blocks-data/registration-blocks-data.component.html
@@ -1,6 +1,6 @@
 @for (question of questions(); track question.id) {
   <div [class.mb-4]="!$last">
-    <h4 class="mb-2" [class.text-lg]="isOverviewPage()">
+    <h4 class="mb-2">
       {{ question.displayText }}
 
       @if (!isOriginalRevision() && updatedKeysMap()[question.responseKey!]) {
@@ -15,7 +15,7 @@ <h4 class="mb-2" [class.text-lg]="isOverviewPage()">
         }
         @case (FieldType.Checkbox) {
           @for (option of reviewData()[question.responseKey!]; track option) {
-            <p class="mb-1">{{ option }}</p>
+            <p class="preserve-whitespace mb-1">{{ option }}</p>
           }
         }
         @case (FieldType.File) {
@@ -43,7 +43,7 @@ <h4 class="mb-2" [class.text-lg]="isOverviewPage()">
       @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>
+        <p class="preserve-whitespace">{{ question.paragraphText! | translate }}</p>
       } @else {
         <p class="font-italic">{{ 'common.labels.noData' | translate }}</p>
       }
diff --git a/src/app/shared/mappers/registration/page-schema.mapper.ts b/src/app/shared/mappers/registration/page-schema.mapper.ts
index 01fc419f3..e5207c49a 100644
--- a/src/app/shared/mappers/registration/page-schema.mapper.ts
+++ b/src/app/shared/mappers/registration/page-schema.mapper.ts
@@ -41,12 +41,18 @@ export class PageSchemaMapper {
 
         case BlockType.Paragraph:
           if (currentQuestion) {
-            currentQuestion.paragraphText = item.attributes.display_text;
+            currentQuestion.paragraphText = currentQuestion.paragraphText
+              ? currentQuestion.paragraphText + '\n \n' + item.attributes.display_text
+              : item.attributes.display_text;
             currentQuestion.fieldType = FieldType.Paragraph;
           } else if (currentSection) {
-            currentSection.description = item.attributes.display_text;
+            currentSection.description = currentSection.description
+              ? currentSection.description + '\n \n' + item.attributes.display_text
+              : item.attributes.display_text;
           } else {
-            currentPage.description = item.attributes.display_text;
+            currentPage.description = currentPage.description
+              ? currentPage.description + '\n \n' + item.attributes.display_text
+              : item.attributes.display_text;
           }
           break;