From 8cbd34aab188da0c8703cba036865ab41e0101e8 Mon Sep 17 00:00:00 2001
From: Daniel Haselhan <daniel@bit3.ca>
Date: Tue, 26 Sep 2023 16:29:16 -0700
Subject: [PATCH] Text Updates

---
 .../naru-details/naru-details.component.html      |  2 +-
 .../nfu-details/nfu-details.component.html        |  2 +-
 .../pfrs-details/pfrs-details.component.html      |  6 +++---
 .../pofo-details/pofo-details.component.html      |  4 ++--
 .../decision-component/pfrs/pfrs.component.html   |  5 ++---
 .../pfrs-input/pfrs-input.component.html          |  3 +--
 .../application/proposal/soil/soil.component.html |  4 ++--
 .../pfrs-details/pfrs-details.component.html      |  8 ++++----
 .../pofo-details/pofo-details.component.html      |  4 ++--
 .../decision-component/pfrs/pfrs.component.html   |  5 ++---
 .../pfrs-input/pfrs-input.component.html          |  3 +--
 .../proposal/soil/soil.component.html             |  4 ++--
 .../naru-details/naru-details.component.html      |  2 +-
 .../nfu-details/nfu-details.component.html        |  2 +-
 .../pfrs-details/pfrs-details.component.html      |  8 ++++----
 .../pofo-details/pofo-details.component.html      |  4 ++--
 .../land-use/land-use.component.html              | 15 ++++++++-------
 .../naru-proposal/naru-proposal.component.html    |  2 +-
 .../land-use/land-use.component.html              |  7 ++-----
 .../pfrs-details/pfrs-details.component.html      |  8 ++++----
 .../pofo-details/pofo-details.component.html      |  4 ++--
 .../notice-of-intent-search-table.component.html  |  2 +-
 .../notification-search-table.component.html      |  2 +-
 .../shared/soil-table/soil-table.component.html   |  5 ++---
 24 files changed, 52 insertions(+), 59 deletions(-)

diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html
index 184080ed88..da70e959f5 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html
@@ -131,7 +131,7 @@
       <div class="grid-1"><strong>Volume</strong></div>
       <div class="grid-2">{{ _applicationSubmission.naruToPlaceVolume }} m<sup>3</sup></div>
       <div class="grid-1"><strong>Area</strong></div>
-      <div class="grid-2">{{ _applicationSubmission.naruToPlaceArea }} ha</div>
+      <div class="grid-2">{{ _applicationSubmission.naruToPlaceArea }} m<sup>2</sup></div>
       <div class="grid-1"><strong>Maximum Depth</strong></div>
       <div class="grid-2">{{ _applicationSubmission.naruToPlaceMaximumDepth }} m</div>
       <div class="grid-1"><strong>Average Depth</strong></div>
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html
index 55227877b5..7468db234f 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/nfu-details/nfu-details.component.html
@@ -54,7 +54,7 @@ <h4>Soil and Fill Components</h4>
       <div class="grid-1"><strong>Volume</strong></div>
       <div class="grid-2">{{ applicationSubmission.nfuFillVolume }} m<sup>3</sup></div>
       <div class="grid-1"><strong>Area</strong></div>
-      <div class="grid-2">{{ applicationSubmission.nfuTotalFillArea }} ha</div>
+      <div class="grid-2">{{ applicationSubmission.nfuTotalFillArea }} m<sup>2</sup></div>
       <div class="grid-1"><strong>Maximum Depth</strong></div>
       <div class="grid-2">{{ applicationSubmission.nfuMaxFillDepth }} m</div>
       <div class="grid-1"><strong>Average Depth</strong></div>
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
index b7d1530232..238f719925 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
@@ -32,7 +32,7 @@
     <div><strong>Area</strong></div>
     <div>
       {{ _applicationSubmission.soilToRemoveArea }}
-      <span *ngIf="_applicationSubmission.soilToRemoveArea !== null">ha</span>
+      <span *ngIf="_applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span>
     </div>
     <div>
       {{ _applicationSubmission.soilToPlaceArea }}
@@ -78,11 +78,11 @@
     <div><strong>Area</strong></div>
     <div>
       {{ _applicationSubmission.soilAlreadyRemovedArea }}
-      <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">ha</span>
+      <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
     </div>
     <div>
       {{ _applicationSubmission.soilAlreadyPlacedArea }}
-      <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">ha</span>
+      <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
     </div>
 
     <div><strong>Maximum Depth</strong></div>
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
index 55f1c61b19..8b093c8712 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
@@ -23,7 +23,7 @@
     </div>
     <div class="grid-1"><strong>Area</strong></div>
     <div class="grid-2">
-      {{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">ha</span>
+      {{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span>
     </div>
     <div class="grid-1"><strong>Maximum Depth</strong></div>
     <div class="grid-2">
@@ -47,7 +47,7 @@
     <div class="grid-1"><strong>Area</strong></div>
     <div class="grid-2">
       {{ _applicationSubmission.soilAlreadyPlacedArea }}
-      <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea">ha</span>
+      <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea">m<sup>2</sup></span>
     </div>
     <div class="grid-1"><strong>Maximum Depth</strong></div>
     <div class="grid-2">
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html
index 87b04a95bc..47ef06075b 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html
@@ -47,11 +47,10 @@
       <tr>
         <td class="soil-table-label">
           Area
-          <div class="subtext">Note: 0.01 ha is 100m2</div>
         </td>
         <td>
           <span *ngIf="component.soilToRemoveArea !== null && component.soilToRemoveArea !== undefined">
-            {{ component.soilToRemoveArea }} ha</span
+            {{ component.soilToRemoveArea }} m<sup>2</sup></span
           >
           <app-no-data
             *ngIf="component.soilToRemoveArea === null || component.soilToRemoveArea === undefined"
@@ -60,7 +59,7 @@
 
         <td>
           <span *ngIf="component.soilToPlaceArea !== null && component.soilToPlaceArea !== undefined"
-            >{{ component.soilToPlaceArea }} ha</span
+            >{{ component.soilToPlaceArea }} m<sup>2</sup></span
           >
           <app-no-data
             *ngIf="component.soilToPlaceArea === null || component.soilToPlaceArea === undefined"
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
index 0235ef5514..626c578605 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
@@ -89,7 +89,6 @@
       </div>
       <div class="label">
         <label for="areaToRemove">Area*</label>
-        <div class="subtext">Note: 0.01 ha is 100m2</div>
       </div>
       <div>
         <mat-form-field appearance="outline" class="full-width">
@@ -101,7 +100,7 @@
             matInput
             formControlName="areaToRemove"
           />
-          <span matTextSuffix>ha</span>
+          <span matTextSuffix>m<sup>2</sup></span>
         </mat-form-field>
       </div>
       <div>
diff --git a/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html b/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html
index 5a4e40d718..53347cd2fe 100644
--- a/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html
+++ b/alcs-frontend/src/app/features/application/proposal/soil/soil.component.html
@@ -31,8 +31,8 @@
       </tr>
       <tr>
         <td class="soil-table-label">Area</td>
-        <td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} ha</td>
-        <td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} ha</td>
+        <td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} m<sup>2</sup></td>
+        <td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} m<sup>2</sup></td>
       </tr>
       <tr>
         <td class="soil-table-label">Maximum Depth</td>
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html
index e7815c1315..9ed94ebb1a 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pfrs-details/pfrs-details.component.html
@@ -32,11 +32,11 @@
     <div><strong>Area</strong></div>
     <div>
       {{ _noiSubmission.soilToRemoveArea }}
-      <span *ngIf="_noiSubmission.soilToRemoveArea !== null">ha</span>
+      <span *ngIf="_noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span>
     </div>
     <div>
       {{ _noiSubmission.soilToPlaceArea }}
-      <span *ngIf="_noiSubmission.soilToPlaceArea !== null">ha</span>
+      <span *ngIf="_noiSubmission.soilToPlaceArea !== null">m<sup>2</sup></span>
     </div>
 
     <div><strong>Maximum Depth</strong></div>
@@ -78,11 +78,11 @@
     <div><strong>Area</strong></div>
     <div>
       {{ _noiSubmission.soilAlreadyRemovedArea }}
-      <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">ha</span>
+      <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
     </div>
     <div>
       {{ _noiSubmission.soilAlreadyPlacedArea }}
-      <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">ha</span>
+      <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
     </div>
 
     <div><strong>Maximum Depth</strong></div>
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html
index 9519ecc0e9..c23c8d82cd 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/pofo-details/pofo-details.component.html
@@ -23,7 +23,7 @@
     </div>
     <div class="grid-1"><strong>Area</strong></div>
     <div class="grid-2">
-      {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">ha</span>
+      {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span>
     </div>
     <div class="grid-1"><strong>Maximum Depth</strong></div>
     <div class="grid-2">
@@ -47,7 +47,7 @@
     <div class="grid-1"><strong>Area</strong></div>
     <div class="grid-2">
       {{ _noiSubmission.soilAlreadyPlacedArea }}
-      <span *ngIf="_noiSubmission.soilAlreadyPlacedArea">ha</span>
+      <span *ngIf="_noiSubmission.soilAlreadyPlacedArea">m<sup>2</sup></span>
     </div>
     <div class="grid-1"><strong>Maximum Depth</strong></div>
     <div class="grid-2">
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html
index 87b04a95bc..47ef06075b 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html
@@ -47,11 +47,10 @@
       <tr>
         <td class="soil-table-label">
           Area
-          <div class="subtext">Note: 0.01 ha is 100m2</div>
         </td>
         <td>
           <span *ngIf="component.soilToRemoveArea !== null && component.soilToRemoveArea !== undefined">
-            {{ component.soilToRemoveArea }} ha</span
+            {{ component.soilToRemoveArea }} m<sup>2</sup></span
           >
           <app-no-data
             *ngIf="component.soilToRemoveArea === null || component.soilToRemoveArea === undefined"
@@ -60,7 +59,7 @@
 
         <td>
           <span *ngIf="component.soilToPlaceArea !== null && component.soilToPlaceArea !== undefined"
-            >{{ component.soilToPlaceArea }} ha</span
+            >{{ component.soilToPlaceArea }} m<sup>2</sup></span
           >
           <app-no-data
             *ngIf="component.soilToPlaceArea === null || component.soilToPlaceArea === undefined"
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
index fa2213b901..678de0ed3e 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
@@ -88,7 +88,6 @@
     </div>
     <div class="label">
       <label for="areaToRemove">Area*</label>
-      <div class="subtext">Note: 0.01 ha is 100m2</div>
     </div>
     <div>
       <mat-form-field appearance="outline" class="full-width">
@@ -100,7 +99,7 @@
           matInput
           formControlName="areaToRemove"
         />
-        <span matTextSuffix>ha</span>
+        <span matTextSuffix>m<sup>2</sup></span>
       </mat-form-field>
     </div>
     <div>
diff --git a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html
index 59611d05d0..af596da7f0 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/proposal/soil/soil.component.html
@@ -31,8 +31,8 @@
       </tr>
       <tr>
         <td class="soil-table-label">Area</td>
-        <td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} ha</td>
-        <td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} ha</td>
+        <td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} m<sup>2</sup></td>
+        <td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} m<sup>2</sup></td>
       </tr>
       <tr>
         <td class="soil-table-label">Maximum Depth</td>
diff --git a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html
index 25521b94b3..6839f37024 100644
--- a/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/naru-details/naru-details.component.html
@@ -220,7 +220,7 @@
       <div class="grid-1"><strong>Area</strong></div>
       <div class="grid-2">
         {{ _applicationSubmission.naruToPlaceArea }}
-        <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">ha</span>
+        <span *ngIf="_applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span>
         <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceArea === null"></app-no-data>
       </div>
       <div class="grid-1"><strong>Maximum Depth</strong></div>
diff --git a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html
index 0e56ee6ac8..c2a2af1d48 100644
--- a/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/nfu-details/nfu-details.component.html
@@ -84,7 +84,7 @@ <h4>Soil and Fill Components</h4>
       <div class="grid-1"><strong>Area</strong></div>
       <div class="grid-2">
         {{ applicationSubmission.nfuTotalFillArea }}
-        <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">ha</span>
+        <span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span>
         <app-no-data
           [showRequired]="showErrors"
           *ngIf="applicationSubmission.nfuTotalFillArea === null"
diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html
index df8b8ed049..07e799d934 100644
--- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html
@@ -48,12 +48,12 @@
     <div><strong>Area</strong></div>
     <div>
       {{ _applicationSubmission.soilToRemoveArea }}
-      <span *ngIf="_applicationSubmission.soilToRemoveArea !== null">ha</span>
+      <span *ngIf="_applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span>
       <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToRemoveArea === null"></app-no-data>
     </div>
     <div>
       {{ _applicationSubmission.soilToPlaceArea }}
-      <span *ngIf="_applicationSubmission.soilToPlaceArea !== null">ha</span>
+      <span *ngIf="_applicationSubmission.soilToPlaceArea !== null">m<sup>2</sup></span>
       <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToPlaceArea === null"></app-no-data>
     </div>
 
@@ -120,7 +120,7 @@
     <div><strong>Area</strong></div>
     <div>
       {{ _applicationSubmission.soilAlreadyRemovedArea }}
-      <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">ha</span>
+      <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
       <app-no-data
         [showRequired]="showErrors"
         *ngIf="_applicationSubmission.soilAlreadyRemovedArea === null"
@@ -128,7 +128,7 @@
     </div>
     <div>
       {{ _applicationSubmission.soilAlreadyPlacedArea }}
-      <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">ha</span>
+      <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
       <app-no-data
         [showRequired]="showErrors"
         *ngIf="_applicationSubmission.soilAlreadyPlacedArea === null"
diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html
index 9a5baee9f3..af82d2b5ce 100644
--- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html
@@ -41,7 +41,7 @@
     </div>
     <div class="grid-1"><strong>Area</strong></div>
     <div class="grid-2">
-      {{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">ha</span>
+      {{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span>
       <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceArea"></app-no-data>
     </div>
     <div class="grid-1"><strong>Maximum Depth</strong></div>
@@ -75,7 +75,7 @@
     <div class="grid-1"><strong>Area</strong></div>
     <div class="grid-2">
       {{ _applicationSubmission.soilAlreadyPlacedArea }}
-      <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">ha</span>
+      <span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
       <app-no-data
         [showRequired]="showErrors"
         *ngIf="_applicationSubmission.soilAlreadyPlacedArea === null"
diff --git a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html
index d791300bf0..238a51bf8c 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/land-use/land-use.component.html
@@ -43,8 +43,8 @@ <h5>Land Use of Parcel(s) under Application</h5>
           <div *ngIf="parcelsAgricultureDescription.errors?.['required']">This field is required</div>
         </div>
         <mat-hint class="subtext"
-          >Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep. Example 2: Parcel 1: 10%
-          blueberry crop, 30% vegetables, 60% hay. Parcel 2: 100% hay.
+          >Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep. Example 2: Parcel 1: 10% blueberry
+          crop, 30% vegetables, 60% hay. Parcel 2: 100% hay.
         </mat-hint>
         <div class="subtext">Characters left: {{ 4000 - parcelsAgricultureDescriptionText.textLength }}</div>
       </div>
@@ -88,7 +88,8 @@ <h6>
           Describe all other uses that currently take place on the parcel(s).
         </label>
         <div class="subtext">
-          Describe other uses such as residential, home-based businesses, commercial, recreational, institutional, industrial, etc.
+          Describe other uses such as residential, home-based businesses, commercial, recreational, institutional,
+          industrial, etc.
         </div>
         <mat-form-field class="display-block" appearance="outline">
           <textarea
@@ -111,14 +112,14 @@ <h6>
           <mat-icon>warning</mat-icon>
           <div *ngIf="parcelsNonAgricultureUseDescription.errors?.['required']">This field is required</div>
         </div>
-        <mat-hint class="subtext">Example: House and 100 square metre detached auto repair shop.</mat-hint>
+        <mat-hint class="subtext"
+          >Example: 100m<sup>2</sup> house and 50m<sup>2</sup> detached auto repair shop</mat-hint
+        >
         <div class="subtext">Characters left: {{ 4000 - parcelsNonAgricultureUseDescriptionText.textLength }}</div>
       </div>
     </div>
     <h5>Choose and describe neighbouring land uses.</h5>
-    <div class="subtext">
-      Choose the main land use type from the drop-down and describe the specific activities.
-    </div>
+    <div class="subtext">Choose the main land use type from the drop-down and describe the specific activities.</div>
     <div class="form-row">
       <div class="full-row">
         <label for="northLandUseType">North</label>
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html
index 0f7217200e..029e424f04 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html
@@ -441,7 +441,7 @@ <h2>Proposal</h2>
 
     <div class="full-row">
       <label for="will-import-fill">
-        Do you need to import any fill to construct or conduct the proposed Non-farm use?
+        Do you need to import any fill to construct or conduct the proposed non-adhering residential use?
       </label>
       <div class="subtext">Fill is any material brought onto the property, including gravel for construction.</div>
       <mat-button-toggle-group
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html
index 875544f0ef..e47b1f85f3 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/land-use/land-use.component.html
@@ -118,11 +118,8 @@ <h6>
         <div class="subtext">Characters left: {{ 4000 - parcelsNonAgricultureUseDescriptionText.textLength }}</div>
       </div>
     </div>
-    <h5>Identify the land uses surrounding the parcel(s) under notice of intent.</h5>
-    <div class="subtext">
-      Choose the Primary Land Use Type from the drop-down list. If there is more than one land use type, choose the main
-      land use and describe all the uses under Specific Activity.
-    </div>
+    <h5>Choose and describe neighbouring land uses.</h5>
+    <div class="subtext">Choose the main land use type from the drop-down and describe the specific activities.</div>
     <div class="form-row">
       <div class="full-row">
         <label for="northLandUseType">North</label>
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html
index b7fbfecedb..8eb5a68445 100644
--- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html
+++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pfrs-details/pfrs-details.component.html
@@ -90,12 +90,12 @@
     <div><strong>Area</strong></div>
     <div>
       {{ _noiSubmission.soilToRemoveArea }}
-      <span *ngIf="_noiSubmission.soilToRemoveArea !== null">ha</span>
+      <span *ngIf="_noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span>
       <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToRemoveArea === null"></app-no-data>
     </div>
     <div>
       {{ _noiSubmission.soilToPlaceArea }}
-      <span *ngIf="_noiSubmission.soilToPlaceArea !== null">ha</span>
+      <span *ngIf="_noiSubmission.soilToPlaceArea !== null">m<sup>2</sup></span>
       <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToPlaceArea === null"></app-no-data>
     </div>
 
@@ -168,12 +168,12 @@
     <div><strong>Area</strong></div>
     <div>
       {{ _noiSubmission.soilAlreadyRemovedArea }}
-      <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">ha</span>
+      <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
       <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedArea === null"></app-no-data>
     </div>
     <div>
       {{ _noiSubmission.soilAlreadyPlacedArea }}
-      <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">ha</span>
+      <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
       <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data>
     </div>
 
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html
index 23c93046d2..0c2b15c43e 100644
--- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html
+++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html
@@ -58,7 +58,7 @@
     </div>
     <div class="grid-1"><strong>Area</strong></div>
     <div class="grid-2">
-      {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">ha</span>
+      {{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span>
       <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceArea"></app-no-data>
     </div>
     <div class="grid-1"><strong>Maximum Depth</strong></div>
@@ -97,7 +97,7 @@
     <div class="grid-1"><strong>Area</strong></div>
     <div class="grid-2">
       {{ _noiSubmission.soilAlreadyPlacedArea }}
-      <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">ha</span>
+      <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
       <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data>
     </div>
     <div class="grid-1"><strong>Maximum Depth</strong></div>
diff --git a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html
index 433b83c6fa..3b77b2f611 100644
--- a/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html
+++ b/portal-frontend/src/app/features/public/search/notice-of-intent-search-table/notice-of-intent-search-table.component.html
@@ -9,7 +9,7 @@
     matSortDisableClear
   >
     <ng-container matColumnDef="fileId">
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Application ID</th>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Notice of Intent ID</th>
       <td mat-cell *matCellDef="let element">
         <a (click)="onSelectRecord(element)">{{ element.fileNumber | emptyColumn }}</a>
       </td>
diff --git a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html
index 90a0b85cbe..c76ae6c02f 100644
--- a/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html
+++ b/portal-frontend/src/app/features/public/search/notification-search-table/notification-search-table.component.html
@@ -9,7 +9,7 @@
     matSortDisableClear
   >
     <ng-container matColumnDef="fileId">
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Application ID</th>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Notification ID</th>
       <td mat-cell *matCellDef="let element">
         <a (click)="onSelectRecord(element)">{{ element.fileNumber | emptyColumn }}</a>
       </td>
diff --git a/portal-frontend/src/app/shared/soil-table/soil-table.component.html b/portal-frontend/src/app/shared/soil-table/soil-table.component.html
index 229597270f..d261e01da8 100644
--- a/portal-frontend/src/app/shared/soil-table/soil-table.component.html
+++ b/portal-frontend/src/app/shared/soil-table/soil-table.component.html
@@ -61,7 +61,6 @@
 
       <div class="label">
         <label for="area">Area</label>
-        <div class="subtext">Note: 0.01 ha is 100m2</div>
       </div>
       <div>
         <mat-form-field appearance="outline">
@@ -74,7 +73,7 @@
             matInput
             formControlName="area"
           />
-          <span matTextSuffix>ha</span>
+          <span matTextSuffix>m<sup>2</sup></span>
         </mat-form-field>
         <div *ngIf="area.invalid && (area.dirty || area.touched)" class="field-error">
           <mat-icon>warning</mat-icon>
@@ -92,7 +91,7 @@
             matInput
             formControlName="area2"
           />
-          <span matTextSuffix>ha</span>
+          <span matTextSuffix>m<sup>2</sup></span>
         </mat-form-field>
         <div *ngIf="area2.invalid && (area2.dirty || area2.touched)" class="field-error">
           <mat-icon>warning</mat-icon>