diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml
index ae45d11abb..eeb7a7af5d 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml
@@ -84,15 +84,15 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="app-page-heading">
+                    <h1 class="app-page-heading nhsuk-u-margin-bottom-0">
                         <span class="nhsuk-caption-xl">
                             @Model.CompetencyAssessmentName
                             <span class="nhsuk-u-visually-hidden"> – </span>
                         </span>
                         Display learner declaration?
                     </h1>
-                    <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 </legend>
+                <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 <div id="example-hints-hint" class="nhsuk-hint">
                     Do you want to prompt learners to agree to the self-assessment process when they first start the self-assessment?
                 </div>
@@ -119,15 +119,15 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="app-page-heading">
+                    <h1 class="app-page-heading nhsuk-u-margin-bottom-0">
                         <span class="nhsuk-caption-xl">
                             @Model.CompetencyAssessmentName
                             <span class="nhsuk-u-visually-hidden"> – </span>
                         </span>
                         Include signposting?
                     </h1>
-                    <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 </legend>
+                <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 <div id="example-hints-hint" class="nhsuk-hint">
                     Do you want to display signposted learning content when a learner submits their self-assessment results?
                 </div>
@@ -154,15 +154,15 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="app-page-heading">
+                    <h1 class="app-page-heading nhsuk-u-margin-bottom-0">
                         <span class="nhsuk-caption-xl">
                             @Model.CompetencyAssessmentName
                             <span class="nhsuk-u-visually-hidden"> – </span>
                         </span>
                         Use linear navigation?
                     </h1>
-                    <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 </legend>
+                <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 <div id="example-hints-hint" class="nhsuk-hint">
                     Do you want the learner to work through @Model.VocabularyPlural.ToLower() using next and previous links? If not, the learner will navigate between @Model.VocabularyPlural.ToLower() using the @Model.VocabularySingular.ToLower() menu.
                 </div>
@@ -189,15 +189,15 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="app-page-heading">
+                    <h1 class="app-page-heading nhsuk-u-margin-bottom-0">
                         <span class="nhsuk-caption-xl">
                             @Model.CompetencyAssessmentName
                             <span class="nhsuk-u-visually-hidden"> – </span>
                         </span>
                         Use description expanders?
                     </h1>
-                    <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 </legend>
+                <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 <div id="example-hints-hint" class="nhsuk-hint">
                     Do you want to show @Model.VocabularySingular.ToLower() descriptions using expanders? If not, the description will be displayed on the page without the user needing to expand it.
                 </div>
@@ -224,15 +224,15 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="app-page-heading">
+                    <h1 class="app-page-heading nhsuk-u-margin-bottom-0">
                         <span class="nhsuk-caption-xl">
                             @Model.CompetencyAssessmentName
                             <span class="nhsuk-u-visually-hidden"> – </span>
                         </span>
                         Custom question label
                     </h1>
-                    <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 </legend>
+                <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 <div id="example-hints-hint" class="nhsuk-hint">
                     Do you want to specify a custom label for self-assessment questions? If not, they will be labelled as “question”.
                 </div>
@@ -271,15 +271,15 @@
         <div class="nhsuk-form-group">
             <fieldset class="nhsuk-fieldset" aria-describedby="example-hints-hint">
                 <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-                    <h1 class="app-page-heading">
+                    <h1 class="app-page-heading nhsuk-u-margin-bottom-0">
                         <span class="nhsuk-caption-xl">
                             @Model.CompetencyAssessmentName
                             <span class="nhsuk-u-visually-hidden"> – </span>
                         </span>
                         Reviewer comments label
                     </h1>
-                    <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 </legend>
+                <partial name="Shared/_PublishedSelfAssessmentWarning" model="new PublishedSelfAssessmentViewModel { UserRole = Model.UserRole, PublishStatusID = Model.PublishStatusID }" />
                 <div id="example-hints-hint" class="nhsuk-hint">
                     Do you want to specify a custom supervisor comments prompt? If not, they will be labelled as “Reviewer comments”.
                 </div>