diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageOptionalCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageOptionalCompetencies.cshtml
index 919fa159e0..16847d0bab 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageOptionalCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageOptionalCompetencies.cshtml
@@ -21,6 +21,7 @@
         </div>
     </nav>
 }
+<div class="nhsuk-form-group">
 <h1 class="app-page-heading">
     <span class="nhsuk-caption-xl">
         @Model.CompetencyAssessmentName
@@ -28,9 +29,8 @@
     </span>
   Manage optional @Model.VocabularyPlural.ToLower()
   </h1>
-<p class="nhsuk-lede-text">
-    Manage optional @Model.VocabularyPlural.ToLower() for the assessment @Model.CompetencyAssessmentName.
-    Optional @Model.VocabularyPlural.ToLower() can be selected for inclusion in a self-assessment by a learner if required.
+<p>
+ Optional proficiencies can be selected for inclusion in a self-assessment by a learner if required.
 </p>
 <dl class="nhsuk-summary-list">
     <div class="nhsuk-summary-list__row">
@@ -84,7 +84,7 @@
         </div>
         <div class="nhsuk-summary-list__row">
             <dt class="nhsuk-summary-list__key">
-                Optional @Model.VocabularySingular.ToLower() learner prompt
+                Optional learner prompt
             </dt>
             <dd class="nhsuk-summary-list__value">
                 @Html.Raw(Model.ManageOptionalCompetenciesPrompt == null ? "No learner prompt specified" : Model.ManageOptionalCompetenciesPrompt.ToString())
@@ -122,3 +122,4 @@
         Cancel
     </a>
 </div>
+</div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml
index 11b5e94bac..3a25a712f8 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml
@@ -21,6 +21,7 @@
         </div>
     </nav>
 }
+<div class="nhsuk-form-group">
 <h1 class="app-page-heading">
     <span class="nhsuk-caption-xl">
         @Model.CompetencyAssessmentName
@@ -29,18 +30,26 @@
     Select optional competencies
 </h1>
 
-<p class="nhsuk-lede-text">
-    Optional competencies can be added to the assessment individually or as a group.
+<p>
+ Optional competencies can be added to the assessment individually or as a group.
 </p>
 <form method="post" asp-action="SelectOptionalCompetencies">
     <fieldset class="nhsuk-fieldset">
 
+        <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
+         Which @Model.VocabularySingular.ToLower() groups and/or @Model.VocabularyPlural.ToLower() should be optional?
+        </legend>
         @foreach (var competencyGroup in Model.CompetencyGroups)
         {
             @if (competencyGroup.Count() > 1)
             {
 
                 <div class="nhsuk-u-margin-bottom-6">
+
+                        <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
+                        @competencyGroup.Key
+                        </legend>
+
                     <h2>
                         @competencyGroup.Key
                     </h2>
@@ -89,6 +98,7 @@
         </svg>
         Cancel
     </a>
+    </div>
 </div>
 @section scripts {
     <script src="@Url.Content("~/js/frameworks/selectoptionalcompetencies.js")" asp-append-version="true"></script>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetMinimumOptionalCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetMinimumOptionalCompetencies.cshtml
index de018d6eb5..50f889e42f 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetMinimumOptionalCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetMinimumOptionalCompetencies.cshtml
@@ -21,6 +21,7 @@
         </div>
     </nav>
 }
+<div class="nhsuk-form-group">
 <h1 class="app-page-heading">
     <span class="nhsuk-caption-xl">
         @Model.CompetencyAssessmentName
@@ -28,8 +29,8 @@
     </span>Set a minimum number of optional @Model.VocabularyPlural.ToLower()
 </h1>
 
-<p class="nhsuk-lede-text">
-    If required, you can specify a minimum number of optional @Model.VocabularyPlural.ToLower() that a learner must select when completing their @Model.CompetencyAssessmentName self-assessment.
+<p>
+ You can specify a minimum number of optional @Model.VocabularyPlural.ToLower() that a learner must select when completing their self-assessment.
 </p>
 <form method="post" asp-action="SetMinimumOptionalCompetencies">
     <nhs-form-group nhs-validation-for="MinimumOptionalCompetencies">
@@ -57,3 +58,4 @@
         Cancel
     </a>
 </div>
+</div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml
index f488ee221c..b12274d2bf 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml
@@ -22,29 +22,31 @@
         </div>
     </nav>
 }
+<div class="nhsuk-form-group">
 <h1 class="app-page-heading">
     <span class="nhsuk-caption-xl">
         @Model.CompetencyAssessmentName
         <span class="nhsuk-u-visually-hidden"> – </span>
-    </span>Optional @Model.VocabularyPlural.ToLower() learner prompt
+    </span>Optional learner prompt
 </h1>
 
-<p class="nhsuk-lede-text">
-    Provide an optional prompt to help learners choose the right optional @Model.VocabularyPlural.ToLower() to include in their @Model.CompetencyAssessmentName self-assessment.
+<p>
+    Provide a prompt to help learners choose the right optional @Model.VocabularyPlural.ToLower() to include in their self-assessment.
 </p>
 <form method="post" asp-action="SetOptionalCompetencyLearnerPrompt">
     <nhs-form-group nhs-validation-for="ManageOptionalCompetenciesPrompt">
         <vc:text-area asp-for="ManageOptionalCompetenciesPrompt"
                       character-count="null"
-                      label="Set optional @Model.VocabularyPlural.ToLower()"
+                      label=""
                       rows="5"
                       css-class="html-editor"
-                      hint-text="This text will be displayed above the optional @Model.VocabularyPlural.ToLower() list to help the learner to choose them."
+                      hint-text="This text will be displayed above the optional @Model.VocabularyPlural.ToLower() list."
                       populate-with-current-value="true"
                       spell-check="false" />
         <span nhs-validation-for="ManageOptionalCompetenciesPrompt"></span>
     </nhs-form-group>
     <input type="hidden" asp-for="ID" />
+        <hr class="nhsuk-section-break nhsuk-section-break--m" />
     <button class="nhsuk-button" type="submit">
         Save
     </button>
@@ -58,6 +60,7 @@
         Cancel
     </a>
 </div>
+</div>
 @section scripts {
     <script src="@Url.Content("~/js/frameworks/htmleditor.js")" asp-append-version="true"></script>
 }