diff --git a/DigitalLearningSolutions.Web/ViewComponents/NumericInputViewComponent.cs b/DigitalLearningSolutions.Web/ViewComponents/NumericInputViewComponent.cs
index 1703bc9752..2a4e652577 100644
--- a/DigitalLearningSolutions.Web/ViewComponents/NumericInputViewComponent.cs
+++ b/DigitalLearningSolutions.Web/ViewComponents/NumericInputViewComponent.cs
@@ -12,7 +12,8 @@ public IViewComponentResult Invoke(
             bool populateWithCurrentValue,
             string type,
             string hintText,
-            string cssClass
+            string cssClass,
+            bool required
         )
         {
             var model = ViewData.Model;
@@ -31,7 +32,8 @@ string cssClass
                 type,
                 errorMessages,
                 string.IsNullOrEmpty(cssClass) ? null : cssClass,
-                string.IsNullOrEmpty(hintText) ? null : hintText
+                string.IsNullOrEmpty(hintText) ? null : hintText,
+                required
             );
             return View(numericInputViewModel);
         }
diff --git a/DigitalLearningSolutions.Web/ViewComponents/RadiosViewComponent.cs b/DigitalLearningSolutions.Web/ViewComponents/RadiosViewComponent.cs
index 7f8250485f..940cdffb22 100644
--- a/DigitalLearningSolutions.Web/ViewComponents/RadiosViewComponent.cs
+++ b/DigitalLearningSolutions.Web/ViewComponents/RadiosViewComponent.cs
@@ -13,7 +13,8 @@ public IViewComponentResult Invoke(
             string label,
             IEnumerable<RadiosListItemViewModel> radios,
             bool populateWithCurrentValues,
-            string? hintText
+            string? hintText,
+            bool required
         )
         {
             var radiosList = radios.Select(
@@ -29,7 +30,8 @@ public IViewComponentResult Invoke(
                 aspFor,
                 label,
                 string.IsNullOrEmpty(hintText) ? null : hintText,
-                radiosList
+                radiosList,
+                required
             );
 
             return View(viewModel);
diff --git a/DigitalLearningSolutions.Web/ViewComponents/SelectListViewComponent.cs b/DigitalLearningSolutions.Web/ViewComponents/SelectListViewComponent.cs
index 2ff75323c7..b4eb19cb8d 100644
--- a/DigitalLearningSolutions.Web/ViewComponents/SelectListViewComponent.cs
+++ b/DigitalLearningSolutions.Web/ViewComponents/SelectListViewComponent.cs
@@ -15,7 +15,7 @@ public IViewComponentResult Invoke(
             IEnumerable<SelectListItem> selectListOptions,
             string? hintText,
             string? cssClass,
-            bool? deselectable
+            bool required
         )
         {
             var model = ViewData.Model;
@@ -36,7 +36,7 @@ public IViewComponentResult Invoke(
                 string.IsNullOrEmpty(hintText) ? null : hintText,
                 errorMessage,
                 hasError,
-                deselectable ?? false
+                required
             );
             return View(selectListViewModel);
         }
diff --git a/DigitalLearningSolutions.Web/ViewComponents/TextInputViewComponent.cs b/DigitalLearningSolutions.Web/ViewComponents/TextInputViewComponent.cs
index 29738bcdab..b767f54680 100644
--- a/DigitalLearningSolutions.Web/ViewComponents/TextInputViewComponent.cs
+++ b/DigitalLearningSolutions.Web/ViewComponents/TextInputViewComponent.cs
@@ -17,6 +17,7 @@ public class TextInputViewComponent : ViewComponent
         /// <param name="hintText">Leave blank for no hint.</param>
         /// <param name="autocomplete">Leave blank to set no autocomplete on the input element.</param>
         /// <param name="cssClass"></param>
+        /// <param name="required"></param>
         /// <returns></returns>
         public IViewComponentResult Invoke(
             string aspFor,
@@ -26,7 +27,8 @@ public IViewComponentResult Invoke(
             bool spellCheck,
             string hintText,
             string autocomplete,
-            string cssClass
+            string cssClass,
+            bool required
         )
         {
             var model = ViewData.Model;
@@ -47,7 +49,8 @@ string cssClass
                 string.IsNullOrEmpty(autocomplete) ? null : autocomplete,
                 errorMessages,
                 string.IsNullOrEmpty(cssClass) ? null : cssClass,
-                string.IsNullOrEmpty(hintText) ? null : hintText
+                string.IsNullOrEmpty(hintText) ? null : hintText,
+                required
             );
             return View(textBoxViewModel);
         }
diff --git a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/NumericInputViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/NumericInputViewModel.cs
index 257a0b5682..37e105ac8e 100644
--- a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/NumericInputViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/NumericInputViewModel.cs
@@ -15,7 +15,8 @@ public NumericInputViewModel(
             string type,
             IEnumerable<string> errorMessages,
             string? cssClass = null,
-            string? hintText = null
+            string? hintText = null,
+            bool required = false
         )
         {
             var errorMessageList = errorMessages.ToList();
@@ -23,12 +24,13 @@ public NumericInputViewModel(
             Id = id;
             Class = cssClass;
             Name = name;
-            Label = label;
+            Label = (!required && !label.EndsWith("(optional)") ? label + " (optional)" : label);
             Value = value;
             Type = type;
             HintText = hintText;
             ErrorMessages = errorMessageList;
             HasError = errorMessageList.Any();
+            Required = required;
         }
 
         public string Id { get; set; }
@@ -39,5 +41,6 @@ public NumericInputViewModel(
         public string Type { get; set; }
         public string? HintText { get; set; }
         public IEnumerable<string> ErrorMessages { get; set; }
+        public bool Required { get; set; }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/RadiosViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/RadiosViewModel.cs
index 757b9d93d8..274cbcba10 100644
--- a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/RadiosViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/RadiosViewModel.cs
@@ -8,13 +8,15 @@ public RadiosViewModel(
             string aspFor,
             string label,
             string? hintText,
-            IEnumerable<RadiosItemViewModel> radios
+            IEnumerable<RadiosItemViewModel> radios,
+            bool required
         )
         {
             AspFor = aspFor;
-            Label = label;
+            Label = (!required && !label.EndsWith("(optional)") ? label + " (optional)" : label);
             HintText = hintText;
             Radios = radios;
+            Required = required;
         }
 
         public string AspFor { get; set; }
@@ -24,5 +26,6 @@ IEnumerable<RadiosItemViewModel> radios
         public string? HintText { get; set; }
 
         public IEnumerable<RadiosItemViewModel> Radios { get; set; }
+        public bool Required { get; set; }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/SelectListViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/SelectListViewModel.cs
index 39f86a278d..de287ed817 100644
--- a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/SelectListViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/SelectListViewModel.cs
@@ -17,20 +17,20 @@ public SelectListViewModel
             string? hintText = null,
             string? errorMessage = null,
             bool hasError = false,
-            bool deselectable = false
+            bool required = false
         )
         {
             Id = id;
             Class = cssClass;
             Name = name;
-            Label = label;
+            Label = (!required && !label.EndsWith("(optional)") ? label + " (optional)" : label);
             Value = value;
             DefaultOption = defaultOption;
             SelectListOptions = selectListOptions;
             HintText = hintText;
             ErrorMessage = errorMessage;
             HasError = hasError;
-            Deselectable = deselectable;
+            Required = required;
         }
 
         public string Id { get; set; }
@@ -43,6 +43,6 @@ public SelectListViewModel
         public string? HintText { get; set; }
         public string? ErrorMessage { get; set; }
         public bool HasError { get; set; }
-        public bool Deselectable { get; set; }
+        public bool Required { get; set; }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/TextInputViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/TextInputViewModel.cs
index 72c97aefff..c293aa1942 100644
--- a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/TextInputViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/TextInputViewModel.cs
@@ -15,7 +15,8 @@ public TextInputViewModel(
             string? autocomplete,
             IEnumerable<string> errorMessages,
             string? cssClass = null,
-            string? hintText = null
+            string? hintText = null,
+            bool required = false
         )
         {
             var errorMessageList = errorMessages.ToList();
@@ -23,12 +24,13 @@ public TextInputViewModel(
             Id = id;
             Class = cssClass;
             Name = name;
-            Label = label;
+            Label = (!required && !label.EndsWith("(optional)") ? label + " (optional)" : label);
             Value = value;
             Type = type;
             SpellCheck = spellCheck;
             Autocomplete = autocomplete;
             HintText = hintText;
+            Required = required;
             ErrorMessages = errorMessageList;
             HasError = errorMessageList.Any();
         }
@@ -42,6 +44,7 @@ public TextInputViewModel(
         public bool SpellCheck { get; set; }
         public string? Autocomplete { get; set; }
         public string? HintText { get; set; }
+        public bool Required { get; set; }
         public IEnumerable<string> ErrorMessages { get; set; }
         public readonly bool HasError;
     }
diff --git a/DigitalLearningSolutions.Web/Views/ChangePassword/Index.cshtml b/DigitalLearningSolutions.Web/Views/ChangePassword/Index.cshtml
index 427ebca147..0f7884fa6d 100644
--- a/DigitalLearningSolutions.Web/Views/ChangePassword/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/ChangePassword/Index.cshtml
@@ -29,7 +29,8 @@
         spell-check="false"
         hint-text=""
         autocomplete="current-password"
-        css-class="nhsuk-u-width-one-half" />
+        css-class="nhsuk-u-width-one-half"
+        required="true" />
 
       <vc:text-input
         asp-for="@nameof(Model.Password)"
@@ -39,7 +40,8 @@
         spell-check="false"
         hint-text="Your new password should have a minimum of 8 characters with at least 1 letter, 1 number and 1 symbol."
         autocomplete="new-password"
-        css-class="nhsuk-u-width-one-half" />
+        css-class="nhsuk-u-width-one-half"
+        required="true" />
 
       <vc:text-input
         asp-for="@nameof(Model.ConfirmPassword)"
@@ -49,7 +51,8 @@
         spell-check="false"
         hint-text=""
         autocomplete="new-password"
-        css-class="nhsuk-u-width-one-half" />
+        css-class="nhsuk-u-width-one-half"
+        required="true" />
 
       <button class="nhsuk-button" type="submit">Change password</button>
     </form>
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/RecommendedLearning/_SearchableRecommendedResourceCard.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/RecommendedLearning/_SearchableRecommendedResourceCard.cshtml
index 72a75eee80..566ef49385 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/RecommendedLearning/_SearchableRecommendedResourceCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/RecommendedLearning/_SearchableRecommendedResourceCard.cshtml
@@ -44,6 +44,7 @@
       <a class="nhsuk-button nhsuk-u-margin-bottom-2 nhsuk-u-margin-top-0"
          role="button"
          data-return-page-enabled="true"
+         aria-label="Add to action plan '@Model.ResourceName'"
          asp-controller="RecommendedLearning"
          asp-action="AddResourceToActionPlan"
          asp-route-selfAssessmentId="@Model.SelfAssessmentId"
@@ -55,6 +56,7 @@
 
     <a class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-bottom-2 nhsuk-u-margin-top-0"
        role="button"
+       aria-label="Preview resource '@Model.ResourceName'"
        asp-controller="Signposting"
        asp-action="LaunchLearningResource"
        asp-route-resourceReferenceId="@Model.LearningHubReferenceId">
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml
index 062a821072..24fe772e85 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml
@@ -12,20 +12,20 @@
   <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" asp-action="SelfAssessmentOverview" asp-route-vocabulary="@Model.VocabPlural()" asp-route-selfAssessmentId="@Model.Assessment.Id" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID" asp-fragment="comp-@Model.CompetencyNumber">@(Model.VocabPlural()) home</a></li>
   <li class="nhsuk-breadcrumb__item">@DisplayStringHelper.Ellipsis(Model.Competency?.Name, 30)</li>
 }
-@section mobilebacklink
-{
+  @section mobilebacklink
+  {
   <p class="nhsuk-breadcrumb__back">
     <a class="nhsuk-breadcrumb__backlink" asp-action="SelfAssessmentOverview"
-       asp-route-vocabulary="@Model.VocabPlural()"
-       asp-route-selfAssessmentId="@Model.Assessment.Id"
-       asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID"
-       asp-fragment="comp-@Model.CompetencyNumber">
+     asp-route-vocabulary="@Model.VocabPlural()"
+     asp-route-selfAssessmentId="@Model.Assessment.Id"
+     asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID"
+     asp-fragment="comp-@Model.CompetencyNumber">
       Back to @Model.VocabPlural()
     </a>
   </p>
 }
-<link rel="stylesheet" href="@Url.Content("~/css/learningPortal/selfAssessment.css")" asp-append-version="true">
-<link rel="stylesheet" href="@Url.Content("~/css/shared/searchableElements/pagination.css")" asp-append-version="true">
+  <link rel="stylesheet" href="@Url.Content("~/css/learningPortal/selfAssessment.css")" asp-append-version="true">
+  <link rel="stylesheet" href="@Url.Content("~/css/shared/searchableElements/pagination.css")" asp-append-version="true">
 @if (errorHasOccurred)
 {
   <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
@@ -49,14 +49,14 @@
   }
   else
   {
-    <h2 class="nhsuk-u-margin-bottom-0 nhsuk-u-font-size-24">
+    <h2 class="nhsuk-u-margin-bottom-2 nhsuk-u-font-size-24">
       @Model.Competency.Name
     </h2>
     @if (Model.Competency.Description != null)
     {
-      <p class="nhsuk-body-l">
+      <div class="nhsuk-body-l">
         @(Html.Raw(@Model.Competency.Description))
-      </p>
+      </div>
     }
   }
 </div>
@@ -107,9 +107,9 @@
         <div class="pagination-button-container">
           <div class="nhsuk-pagination-item--previous">
             <a class="nhsuk-back-link__link"
-               asp-action=@(Model.CompetencyNumber == 1 ? "SelfAssessment" : "SelfAssessmentCompetency")
-               asp-route-selfAssessmentId="@Model.Assessment.Id"
-               asp-route-competencyNumber=@(Model.CompetencyNumber == 1 ? "" : (Model.CompetencyNumber - 1).ToString())>
+             asp-action=@(Model.CompetencyNumber == 1 ? "SelfAssessment" : "SelfAssessmentCompetency")
+             asp-route-selfAssessmentId="@Model.Assessment.Id"
+             asp-route-competencyNumber=@(Model.CompetencyNumber == 1 ? "" : (Model.CompetencyNumber - 1).ToString())>
               <svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" focusable="false" aria-hidden="true">
                 <path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
               </svg>
@@ -119,22 +119,23 @@
         </div>
         <div class="page-indicator-container">
           <a class="nhsuk-back-link__link"
-             asp-action="SelfAssessmentOverview"
-             asp-route-selfAssessmentId="@Model.Assessment.Id" asp-route-vocabulary="@Model.VocabPlural()" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID" asp-fragment="comp-@Model.CompetencyNumber">
+           asp-action="SelfAssessmentOverview"
+           asp-route-selfAssessmentId="@Model.Assessment.Id" asp-route-vocabulary="@Model.VocabPlural()" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID" asp-fragment="comp-@Model.CompetencyNumber">
             <span class="nhsuk-pagination__page">Return to @Model.VocabPlural() home</span>
           </a>
         </div>
         <div class="pagination-button-container nhsuk-u-margin-right-6">
           <div class="nhsuk-pagination-item--next">
             <a class="nhsuk-back-link__link skip-link"
-               asp-action="SelfAssessmentCompetency"
-               asp-route-selfAssessmentId="@Model.Assessment.Id"
-               asp-route-competencyNumber="@(Model.CompetencyNumber + 1)">
+             asp-action="SelfAssessmentCompetency"
+             asp-route-selfAssessmentId="@Model.Assessment.Id"
+             asp-route-competencyNumber="@(Model.CompetencyNumber + 1)">
               <span class="nhsuk-pagination__page">Skip question</span>
               <span>
-              <svg class="nhsuk-icon nhsuk-icon__chevron-left" id="skip-arrow" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" focusable="false" aria-hidden="true">
-                <path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
-              </svg></span>
+                <svg class="nhsuk-icon nhsuk-icon__chevron-left" id="skip-arrow" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" focusable="false" aria-hidden="true">
+                  <path d="M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z"></path>
+                </svg>
+              </span>
             </a>
           </div>
         </div>
@@ -145,8 +146,8 @@
   {
     <div class="nhsuk-back-link nhsuk-grid-column-full">
       <a class="nhsuk-back-link__link"
-         asp-action="SelfAssessmentOverview"
-         asp-route-selfAssessmentId="@Model.Assessment.Id" asp-route-vocabulary="@Model.VocabPlural()" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID" asp-fragment="comp-@Model.CompetencyNumber">
+       asp-action="SelfAssessmentOverview"
+       asp-route-selfAssessmentId="@Model.Assessment.Id" asp-route-vocabulary="@Model.VocabPlural()" asp-route-competencyGroupId="@Model.Competency.CompetencyGroupID" asp-fragment="comp-@Model.CompetencyNumber">
         <svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" focusable="false" aria-hidden="true">
           <path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
         </svg>Return to @Model.VocabPlural() home
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_RadioQuestion.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_RadioQuestion.cshtml
index befa86fd1f..50034a8eee 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_RadioQuestion.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_RadioQuestion.cshtml
@@ -1,35 +1,45 @@
 @using DigitalLearningSolutions.Data.Models.SelfAssessments
 @model AssessmentQuestion
 
-<h3 class="nhsuk-u-margin-bottom-1">@Model.Question</h3>
-@if (Model.ScoringInstructions != null)
-{
-  <div class="nhsuk-hint">
-    @(Html.Raw(Model.ScoringInstructions))
-  </div>
-}
-<div class="nhsuk-radios nhsuk-u-margin-bottom-3 nhsuk-u-margin-top-3">
-  @foreach (var levelDescriptor in Model.LevelDescriptors)
-  {
-    <div class="nhsuk-radios__item">
-      <input class="nhsuk-radios__input select-all-checkbox"
-             name="[@ViewData["index"]].Result" id="radio-@Model.Id-@levelDescriptor.LevelValue"
-             data-group="group@(Model.Id)"
-             checked="@(Model.Result == @levelDescriptor.LevelValue)" type="radio" value="@levelDescriptor.LevelValue"
-             aria-describedby="radio-@Model.Id-@levelDescriptor.LevelValue-item-hint">
-      <label class="nhsuk-label nhsuk-radios__label" for="radio-@Model.Id-@levelDescriptor.LevelValue">
-        @levelDescriptor.LevelLabel
-      </label>
-      <div class="nhsuk-hint nhsuk-radios__hint" id="radio-@Model.Id-@levelDescriptor.LevelValue-item-hint">
-        @levelDescriptor.LevelDescription
+<div class="nhsuk-u-margin-bottom-4 nhsuk-u-margin-top-6">
+  <fieldset class="nhsuk-fieldset">
+    <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
+      <h3 class="nhsuk-fieldset__heading">
+        @Model.Question
+      </h3>
+      <div class="nhsuk-hint">
+        @if (Model.ScoringInstructions != null)
+        {
+          <p>@(Html.Raw(Model.ScoringInstructions))</p>
+        }
+        <p>Please pick one answer.</p>
       </div>
+    </legend>
+
+    <div class="nhsuk-radios">
+
+      @foreach (var levelDescriptor in Model.LevelDescriptors)
+      {
+        <div class="nhsuk-radios__item">
+          <input class="nhsuk-radios__input select-all-checkbox"
+               name="[@ViewData["index"]].Result" id="radio-@Model.Id-@levelDescriptor.LevelValue"
+               data-group="group@(Model.Id)"
+               checked="@(Model.Result == @levelDescriptor.LevelValue)" type="radio" value="@levelDescriptor.LevelValue"
+               aria-describedby="radio-@Model.Id-@levelDescriptor.LevelValue-item-hint">
+          <label class="nhsuk-label nhsuk-radios__label" for="radio-@Model.Id-@levelDescriptor.LevelValue">
+            @levelDescriptor.LevelLabel
+          </label>
+          <div class="nhsuk-hint nhsuk-radios__hint" id="radio-@Model.Id-@levelDescriptor.LevelValue-item-hint">
+            @levelDescriptor.LevelDescription
+          </div>
+        </div>
+      }
     </div>
-  }
+  </fieldset>
 </div>
-<div class="js-only-inline nhsuk-u-margin-top-1 nhsuk-u-margin-bottom-3">
-  <a class="deselect-all" href="javascript:void(0);"
-     data-group="group@(Model.Id)"
-     >
+<div class="js-only-inline nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-6">
+  <a class="deselect-all" href="javascript:void(0);" aria-label="Clear selection for '@Model.Question'"
+     data-group="group@(Model.Id)">
     Clear selection
   </a>
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/Login/Index.cshtml b/DigitalLearningSolutions.Web/Views/Login/Index.cshtml
index 5be566fef0..31d14de10b 100644
--- a/DigitalLearningSolutions.Web/Views/Login/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Login/Index.cshtml
@@ -28,7 +28,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="username"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="Password"
                      label="Password"
@@ -37,7 +38,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="current-password"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <div class="nhsuk-checkboxes__item">
         <input class="nhsuk-checkboxes__input" type="checkbox" id="RememberMe" spellcheck="false" asp-for="RememberMe"/>
diff --git a/DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml b/DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml
index 8e2d306212..1e35e7fcc0 100644
--- a/DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml
+++ b/DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml
@@ -51,7 +51,8 @@
         spell-check="false"
         autocomplete="given-name"
         hint-text=""
-        css-class="nhsuk-u-width-one-half" />
+        css-class="nhsuk-u-width-one-half"
+        required="true"/>
 
       <vc:text-input
         asp-for="@nameof(Model.LastName)"
@@ -61,7 +62,8 @@
         spell-check="false"
         autocomplete="family-name"
         hint-text=""
-        css-class="nhsuk-u-width-one-half" />
+        css-class="nhsuk-u-width-one-half"
+        required="true" />
 
       <vc:text-input
         asp-for="@nameof(Model.Email)"
@@ -71,7 +73,8 @@
         spell-check="false"
         autocomplete="email"
         hint-text=""
-        css-class="nhsuk-u-width-one-half" />
+        css-class="nhsuk-u-width-one-half"
+        required="true" />
 
       @if (Model.IsDelegateUser) {
         <partial name="_EditRegistrationNumber" model="@Model" />
@@ -88,7 +91,7 @@
           label="Job group"
           value="@Model.JobGroupId.ToString()"
           hint-text=""
-          deselectable="false"
+          required="true"
           css-class="nhsuk-u-width-one-half"
           default-option="Select a job group"
           select-list-options="@Model.JobGroups" />
@@ -100,7 +103,7 @@
               label="@(customField.Prompt + (customField.Mandatory ? "" : " (optional)"))"
               value="@customField.Answer"
               hint-text=""
-              deselectable="@(!customField.Mandatory)"
+              required="@(customField.Mandatory)"
               css-class="nhsuk-u-width-one-half"
               default-option="Select a @customField.Prompt.ToLower()"
               select-list-options="@customField.Options" />
@@ -113,7 +116,8 @@
               spell-check="false"
               autocomplete=""
               hint-text=""
-              css-class="nhsuk-u-width-one-half" />
+              css-class="nhsuk-u-width-one-half"
+              required="@customField.Mandatory" />
           }
         }
       </div>
@@ -158,7 +162,8 @@
         spell-check="false"
         autocomplete=""
         hint-text=""
-        css-class="nhsuk-u-width-one-half" />
+        css-class="nhsuk-u-width-one-half"
+        required="true"/>
 
       <button name="action" class="nhsuk-button" value="save">Save</button>
     </div>
diff --git a/DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml b/DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml
index a54c4e4868..1fc25d28cc 100644
--- a/DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml
@@ -31,7 +31,7 @@
                       label="Job Group"
                       value="@Model.JobGroup?.ToString()"
                       hint-text=""
-                      deselectable="false"
+                      required="true"
                       css-class="nhsuk-u-width-one-half"
                       default-option="Select a job group"
                       select-list-options="@Model.JobGroupOptions" />
@@ -44,7 +44,7 @@
                           label="@(customField.Prompt + (customField.Mandatory ? "" : " (optional)"))"
                           value="@customField.Answer"
                           hint-text=""
-                          deselectable="@(!customField.Mandatory)"
+                          required="@(customField.Mandatory)"
                           css-class="nhsuk-u-width-one-half"
                           default-option="Select a @customField.Prompt.ToLower()"
                           select-list-options="@customField.Options" />
@@ -56,7 +56,8 @@
                          spell-check="false"
                          hint-text=""
                          autocomplete=""
-                         css-class="nhsuk-u-width-one-half" />
+                         css-class="nhsuk-u-width-one-half"
+                         required="@customField.Mandatory" />
         }
       }
 
diff --git a/DigitalLearningSolutions.Web/Views/Register/Password.cshtml b/DigitalLearningSolutions.Web/Views/Register/Password.cshtml
index 41c9d2be4f..c19876e260 100644
--- a/DigitalLearningSolutions.Web/Views/Register/Password.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Register/Password.cshtml
@@ -23,7 +23,8 @@
                      spell-check="false"
                      autocomplete="new-password"
                      hint-text="Your new password should have a minimum of 8 characters with at least 1 letter, 1 number and 1 symbol."
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="ConfirmPassword"
                      label="Re-type password"
@@ -32,7 +33,8 @@
                      spell-check="false"
                      autocomplete="new-password"
                      hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <a class="nhsuk-button nhsuk-button--secondary" asp-controller="Register" asp-action="LearnerInformation" role="button">Back</a>
       <button class="nhsuk-button" type="submit">Next</button>
diff --git a/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml b/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml
index 315bcc223b..7fdac4dfe8 100644
--- a/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml
@@ -37,13 +37,13 @@
           </p>
 
           <vc:select-list asp-for="Centre"
-                          label="Centre"
-                          value="@Model.Centre?.ToString()"
-                          hint-text=""
-                          deselectable="false"
-                          css-class="nhsuk-u-width-full"
-                          default-option="Select a centre"
-                          select-list-options="@Model.CentreOptions" />
+                        label="Centre"
+                        value="@Model.Centre?.ToString()"
+                        hint-text="Visit the <a href='../FindYourCentre'>Find your centre</a> page for help locating your DLS centre."
+                        required="true"
+                        css-class="nhsuk-u-width-full"
+                        default-option="Select a centre"
+                        select-list-options="@Model.CentreOptions" />
         }
       </div>
 
@@ -61,7 +61,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="given-name"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="LastName"
                      label="Last name"
@@ -70,7 +71,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="family-name"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="Email"
                      label="Email"
@@ -79,7 +81,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="email"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <button class="nhsuk-button" type="submit">Next</button>
     </form>
diff --git a/DigitalLearningSolutions.Web/Views/RegisterAdmin/LearnerInformation.cshtml b/DigitalLearningSolutions.Web/Views/RegisterAdmin/LearnerInformation.cshtml
index fee8387f1e..b82d4b6e85 100644
--- a/DigitalLearningSolutions.Web/Views/RegisterAdmin/LearnerInformation.cshtml
+++ b/DigitalLearningSolutions.Web/Views/RegisterAdmin/LearnerInformation.cshtml
@@ -20,7 +20,7 @@
                       label="Job Group"
                       value="@Model.JobGroup?.ToString()"
                       hint-text=""
-                      deselectable="false"
+                      required="true"
                       css-class="nhsuk-u-width-one-half"
                       default-option="Select a job group"
                       select-list-options="@Model.JobGroupOptions" />
diff --git a/DigitalLearningSolutions.Web/Views/RegisterAdmin/Password.cshtml b/DigitalLearningSolutions.Web/Views/RegisterAdmin/Password.cshtml
index 130eaaa776..c394f3a566 100644
--- a/DigitalLearningSolutions.Web/Views/RegisterAdmin/Password.cshtml
+++ b/DigitalLearningSolutions.Web/Views/RegisterAdmin/Password.cshtml
@@ -23,7 +23,8 @@
                      spell-check="false"
                      autocomplete="new-password"
                      hint-text="Your new password should have a minimum of 8 characters with at least 1 letter, 1 number and 1 symbol."
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true"/>
 
       <vc:text-input asp-for="ConfirmPassword"
                      label="Re-type password"
@@ -32,7 +33,8 @@
                      spell-check="false"
                      autocomplete="new-password"
                      hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <a class="nhsuk-button nhsuk-button--secondary" asp-controller="RegisterAdmin" asp-action="LearnerInformation" role="button">Back</a>
       <button class="nhsuk-button" type="submit">Next</button>
diff --git a/DigitalLearningSolutions.Web/Views/RegisterAdmin/PersonalInformation.cshtml b/DigitalLearningSolutions.Web/Views/RegisterAdmin/PersonalInformation.cshtml
index 81a980d286..239f198c42 100644
--- a/DigitalLearningSolutions.Web/Views/RegisterAdmin/PersonalInformation.cshtml
+++ b/DigitalLearningSolutions.Web/Views/RegisterAdmin/PersonalInformation.cshtml
@@ -31,7 +31,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="given-name"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="LastName"
                      label="Last name"
@@ -40,7 +41,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="family-name"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="Email"
                      label="Email"
@@ -49,7 +51,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="email"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <button class="nhsuk-button" type="submit">Next</button>
     </form>
diff --git a/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/LearnerInformation.cshtml b/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/LearnerInformation.cshtml
index b4ec861aee..0ab49f8760 100644
--- a/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/LearnerInformation.cshtml
+++ b/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/LearnerInformation.cshtml
@@ -34,7 +34,7 @@
                       label="Job Group"
                       value="@Model.JobGroup?.ToString()"
                       hint-text=""
-                      deselectable="false"
+                      required="true"
                       css-class="nhsuk-u-width-one-half"
                       default-option="Select a job group"
                       select-list-options="@Model.JobGroupOptions" />
@@ -47,7 +47,7 @@
                           label="@(customField.Prompt + (customField.Mandatory ? "" : " (optional)"))"
                           value="@customField.Answer"
                           hint-text=""
-                          deselectable="@(!customField.Mandatory)"
+                          required="@(customField.Mandatory)"
                           css-class="nhsuk-u-width-one-half"
                           default-option="Select a @customField.Prompt.ToLower()"
                           select-list-options="@customField.Options" />
@@ -59,7 +59,8 @@
                          spell-check="false"
                          hint-text=""
                          autocomplete=""
-                         css-class="nhsuk-u-width-one-half" />
+                         css-class="nhsuk-u-width-one-half"
+                         required="@customField.Mandatory" />
         }
       }
 
diff --git a/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/Password.cshtml b/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/Password.cshtml
index 605ba9160d..7b89b8f83a 100644
--- a/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/Password.cshtml
+++ b/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/Password.cshtml
@@ -34,7 +34,8 @@
                      spell-check="false"
                      autocomplete=""
                      hint-text="Password should have a minimum of 8 characters with at least 1 letter, 1 number and 1 symbol."
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="false" />
 
       <a class="nhsuk-button nhsuk-button--secondary" asp-controller="RegisterDelegateByCentre" asp-action="WelcomeEmail" role="button">Back</a>
       <button class="nhsuk-button" type="submit">Next</button>
diff --git a/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/PersonalInformation.cshtml b/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/PersonalInformation.cshtml
index af696d84ae..8a34d1cf10 100644
--- a/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/PersonalInformation.cshtml
+++ b/DigitalLearningSolutions.Web/Views/RegisterDelegateByCentre/PersonalInformation.cshtml
@@ -35,7 +35,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="given-name"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="LastName"
                      label="Last name"
@@ -44,7 +45,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="family-name"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="Email"
                      label="Email"
@@ -53,7 +55,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="email"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="Alias"
                      label="Alias (optional)"
@@ -62,7 +65,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="false"/>
 					 
       <button class="nhsuk-button" type="submit">Next</button>
     </form>
diff --git a/DigitalLearningSolutions.Web/Views/ResetPassword/Index.cshtml b/DigitalLearningSolutions.Web/Views/ResetPassword/Index.cshtml
index 055fe4130c..29ad530909 100644
--- a/DigitalLearningSolutions.Web/Views/ResetPassword/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/ResetPassword/Index.cshtml
@@ -33,7 +33,8 @@
                      spell-check="false"
                      hint-text="Your new password should have a minimum of 8 characters with at least 1 letter, 1 number and 1 symbol."
                      autocomplete="new-password"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="@nameof(Model.ConfirmPassword)"
                      label="Re-type password"
@@ -42,7 +43,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="new-password"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <button class="nhsuk-button" type="submit">Reset password</button>
     </form>
diff --git a/DigitalLearningSolutions.Web/Views/SetPassword/Index.cshtml b/DigitalLearningSolutions.Web/Views/SetPassword/Index.cshtml
index 76b3e4ab3c..4652cc5fd5 100644
--- a/DigitalLearningSolutions.Web/Views/SetPassword/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/SetPassword/Index.cshtml
@@ -33,7 +33,8 @@
                      spell-check="false"
                      hint-text="Your new password should have a minimum of 8 characters with at least 1 letter, 1 number and 1 symbol."
                      autocomplete="new-password"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="@nameof(Model.ConfirmPassword)"
                      label="Re-type password"
@@ -42,7 +43,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="new-password"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true"/>
 
       <button class="nhsuk-button" type="submit">Set password</button>
     </form>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/Checkboxes/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/Checkboxes/Default.cshtml
index a527176029..a679d21ac2 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/Checkboxes/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/Checkboxes/Default.cshtml
@@ -11,14 +11,16 @@
       </label>
     </legend>
 
-    @if (Model.HintText != null) {
+    @if (Model.HintText != null)
+    {
       <div class="nhsuk-hint" id="@Model.Label.RemoveWhitespace()-hint">
-        @Model.HintText
+        @Html.Raw(Model.HintText)
       </div>
     }
 
     <div class="nhsuk-checkboxes">
-      @foreach (var checkbox in Model.Checkboxes) {
+      @foreach (var checkbox in Model.Checkboxes)
+      {
         <partial name="_CheckboxItem" model="checkbox" />
       }
     </div>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/DateRangeInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/DateRangeInput/Default.cshtml
index 099ff991a1..f647d12e1a 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/DateRangeInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/DateRangeInput/Default.cshtml
@@ -6,9 +6,10 @@
     <legend class="nhsuk-fieldset__legend nhsuk-label nhsuk-heading-m">
       @Model.Label
     </legend>
-    @if (Model.HintText != null) {
+    @if (Model.HintText != null)
+    {
       <div class="nhsuk-hint" id="@Model.Id-hint">
-        @Model.HintText
+        @Html.Raw(Model.HintText)
       </div>
     }
 
@@ -27,7 +28,8 @@
         <label class="nhsuk-label nhsuk-checkboxes__label" for="@Model.EndDateCheckbox.Id">
           Set end date
         </label>
-        @if (Model.EndDateCheckbox.HintText != null) {
+        @if (Model.EndDateCheckbox.HintText != null)
+        {
           <div class="nhsuk-hint nhsuk-checkboxes__hint" id="@Model.EndDateCheckbox.Id-item-hint">
             @Model.EndDateCheckbox.HintText
           </div>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/FileInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/FileInput/Default.cshtml
index 295107313c..ffe98070f4 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/FileInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/FileInput/Default.cshtml
@@ -1,37 +1,37 @@
 @using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
 @model FileInputViewModel
 @{
-    var describedBy = "";
-    @if (Model.HasError)
-    {
-        describedBy = @Model.Name + "-error";
-    }
-    @if (Model.HintText != null)
-    {
-        describedBy += (describedBy != "" ? " " : "");
-        describedBy += @Model.Name + "-hint";
-    }
+  var describedBy = "";
+  @if (Model.HasError)
+  {
+    describedBy = @Model.Name + "-error";
+  }
+  @if (Model.HintText != null)
+  {
+    describedBy += (describedBy != "" ? " " : "");
+    describedBy += @Model.Name + "-hint";
+  }
 }
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
-    <label class="nhsuk-label" for="@Model.Name">
-        @Model.Label
-    </label>
-    @if (Model.HintText != null)
-    {
-        <div class="nhsuk-hint" id="@Model.Name-hint">
-            @Model.HintText
-        </div>
-    }
-    @if (Model.HasError)
-    {
-        <span class="nhsuk-error-message" id="@Model.Name-error">
-            <span class="nhsuk-u-visually-hidden">Error:</span> @Model.ErrorMessage
-        </span>
-    }
-    <input class="nhsuk-input @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
-           id="@Model.Id"
-           name="@Model.Name"
-           type="file"
-           aria-invalid="@(Model.HasError ? "true" : null)"
-           aria-describedby="@(describedBy!= "" ? @describedBy : null)" />
+  <label class="nhsuk-label" for="@Model.Name">
+    @Model.Label
+  </label>
+  @if (Model.HintText != null)
+  {
+    <div class="nhsuk-hint" id="@Model.Name-hint">
+      @Html.Raw(Model.HintText)
+    </div>
+  }
+  @if (Model.HasError)
+  {
+    <span class="nhsuk-error-message" id="@Model.Name-error">
+      <span class="nhsuk-u-visually-hidden">Error:</span> @Model.ErrorMessage
+    </span>
+  }
+  <input class="nhsuk-input @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
+         id="@Model.Id"
+         name="@Model.Name"
+         type="file"
+         aria-invalid="@(Model.HasError ? "true" : null)"
+         aria-describedby="@(describedBy!= "" ? @describedBy : null)" />
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/NumericInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/NumericInput/Default.cshtml
index 91ecf9f654..670f611b08 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/NumericInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/NumericInput/Default.cshtml
@@ -1,45 +1,46 @@
 @using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
 @model NumericInputViewModel
 @{
-    var describedBy = "";
-    @if (Model.HasError)
-    {
-        describedBy = @Model.Name + "-error";
-    }
-    @if (Model.HintText != null)
-    {
-        describedBy += (describedBy != "" ? " " : "");
-        describedBy += @Model.Name + "-hint";
-    }
+  var describedBy = "";
+  @if (Model.HasError)
+  {
+    describedBy = @Model.Name + "-error";
+  }
+  @if (Model.HintText != null)
+  {
+    describedBy += (describedBy != "" ? " " : "");
+    describedBy += @Model.Name + "-hint";
+  }
 }
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
-    <label class="nhsuk-label" for="@Model.Name">
-        @Model.Label
-    </label>
-    @if (Model.HintText != null)
-    {
-        <div class="nhsuk-hint" id="@Model.Name-hint">
-            @Model.HintText
-        </div>
-    }
-    @if (Model.HasError)
-    {
-        <div id="@Model.Name-error" class="nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
-            @foreach (var errorMessage in Model.ErrorMessages)
-            {
-                <span class="error-message--margin-bottom-1 nhsuk-error-message">
-                    <span class="nhsuk-u-visually-hidden">Error:</span> @errorMessage
-                </span>
-            }
-        </div>
-    }
-    <input class="nhsuk-input @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
-           id="@Model.Id"
-           name="@Model.Name"
-           value="@Model.Value"
-           type="@Model.Type"
-           pattern="[0-9]*"
-           inputmode="numeric"
-           aria-invalid="@(Model.HasError ? "true" : null)"
-           aria-describedby="@(describedBy!= "" ? @describedBy : null)" />
+  <label class="nhsuk-label" for="@Model.Name">
+    @Model.Label
+  </label>
+  @if (Model.HintText != null)
+  {
+    <div class="nhsuk-hint" id="@Model.Name-hint">
+      @Html.Raw(Model.HintText)
+    </div>
+  }
+  @if (Model.HasError)
+  {
+    <div id="@Model.Name-error" class="nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
+      @foreach (var errorMessage in Model.ErrorMessages)
+      {
+        <span class="error-message--margin-bottom-1 nhsuk-error-message">
+          <span class="nhsuk-u-visually-hidden">Error:</span> @errorMessage
+        </span>
+      }
+    </div>
+  }
+  <input class="nhsuk-input @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
+         id="@Model.Id"
+         name="@Model.Name"
+         value="@Model.Value"
+         type="@Model.Type"
+         pattern="[0-9]*"
+         inputmode="numeric"
+         aria-invalid="@(Model.HasError ? "true" : null)"
+         aria-describedby="@(describedBy!= "" ? @describedBy : null)"
+         aria-required="@(Model.Required ? "true" : "false" )" />
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/Radios/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/Radios/Default.cshtml
index 9ff78f8482..ee9c831f86 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/Radios/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/Radios/Default.cshtml
@@ -11,27 +11,30 @@
       </label>
     </legend>
 
-    @if (Model.HintText != null) {
+    @if (Model.HintText != null)
+    {
       <div class="nhsuk-hint" id="@Model.Label.RemoveWhitespace()-hint">
-        @Model.HintText
+        @Html.Raw(Model.HintText)
       </div>
     }
 
-    <div class="nhsuk-radios">
-      @foreach (var (radio, index) in Model.Radios.Select((r, i) => (r, i))) {
+    <div class="nhsuk-radios" aria-required="@(Model.Required ? "true" : "false" )">
+      @foreach (var (radio, index) in Model.Radios.Select((r, i) => (r, i)))
+      {
         var radioId = $"{radio.Value}-{index}";
         <div class="nhsuk-radios__item">
           <input class="nhsuk-radios__input"
-                 id="@radioId"
-                 name="@Model.AspFor"
-                 type="radio"
-                 value="@radio.Value"
-                 aria-describedby="@radio.Value-item-hint"
-                 @(radio.Selected ? "checked" : string.Empty) />
+               id="@radioId"
+               name="@Model.AspFor"
+               type="radio"
+               value="@radio.Value"
+               aria-describedby="@radio.Value-item-hint"
+               @(radio.Selected ? "checked" : string.Empty) />
           <label class="nhsuk-label nhsuk-radios__label" for="@radioId">
             @radio.Label
           </label>
-          @if (radio.HintText != null) {
+          @if (radio.HintText != null)
+          {
             <div class="nhsuk-hint nhsuk-radios__hint" id="@radio.Value-item-hint">
               @radio.HintText
             </div>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
index 10495970b4..e58527ee0d 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
@@ -1,44 +1,45 @@
 @using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
 @model SelectListViewModel
 @{
-    var describedBy = "";
-    @if (Model.HasError)
-    {
-        describedBy = @Model.Name + "-error";
-    }
-    @if (Model.HintText != null)
-    {
-        describedBy += (describedBy != "" ? " " : "");
-        describedBy += @Model.Name + "-hint";
-    }
+  var describedBy = "";
+  @if (Model.HasError)
+  {
+    describedBy = @Model.Name + "-error";
+  }
+  @if (Model.HintText != null)
+  {
+    describedBy += (describedBy != "" ? " " : "");
+    describedBy += @Model.Name + "-hint";
+  }
 }
 
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
-    <label class="nhsuk-label" for="@Model.Name">
-        @Model.Label
-    </label>
-    @if (Model.HintText != null)
-    {
-        <div class="nhsuk-hint" id="@Model.Name-hint">
-            @Model.HintText
-        </div>
-    }
-    @if (Model.HasError)
+  <label class="nhsuk-label" for="@Model.Name">
+    @Model.Label
+  </label>
+  @if (Model.HintText != null)
+  {
+    <div class="nhsuk-hint" id="@Model.Name-hint">
+      @Html.Raw(Model.HintText)
+    </div>
+  }
+  @if (Model.HasError)
+  {
+    <span class="nhsuk-error-message" id="@Model.Name-error">
+      <span class="nhsuk-u-visually-hidden">Error:</span> @Model.ErrorMessage
+    </span>
+  }
+  <select class="nhsuk-select @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
+          id="@Model.Id"
+          name="@Model.Name"
+          value="@(Model.Value != null ? Model.Value : null)"
+          asp-items="Model.SelectListOptions"
+          aria-describedby="@(describedBy!= "" ? @describedBy : null)"
+          aria-invalid="@(Model.HasError ? "true" : null)"
+          aria-required="@(Model.Required ? "true" : "false" )">
+    @if (Model.DefaultOption != null)
     {
-        <span class="nhsuk-error-message" id="@Model.Name-error">
-            <span class="nhsuk-u-visually-hidden">Error:</span> @Model.ErrorMessage
-        </span>
+      <option value="" disabled="@(Model.Required)" selected=@(Model.Value != null ? "" : "selected")>@Model.DefaultOption</option>
     }
-    <select class="nhsuk-select @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
-            id="@Model.Id"
-            name="@Model.Name"
-            value="@(Model.Value != null ? Model.Value : null)"
-            asp-items="Model.SelectListOptions"
-            aria-describedby="@(describedBy!= "" ? @describedBy : null)"
-            aria-invalid="@(Model.HasError ? "true" : null)">
-        @if (Model.DefaultOption != null)
-        {
-            <option value="" disabled="@(!Model.Deselectable)" selected=@(Model.Value != null ? "" : "selected")>@Model.DefaultOption</option>
-        }
-    </select>
-    </div>
+  </select>
+</div>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml
index b66543328f..8842f28a6b 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml
@@ -24,7 +24,7 @@
   @if (Model.HintText != null)
   {
     <div class="nhsuk-hint" id="@Model.Name-hint">
-      @Model.HintText
+      @Html.Raw(Model.HintText)
     </div>
   }
   @if (Model.HasError)
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
index 5aeca9c0ea..2c8779a940 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
@@ -1,45 +1,46 @@
 @using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
 @model TextInputViewModel
 @{
-    var describedBy = "";
-    @if (Model.HasError)
-    {
-        describedBy = @Model.Name + "-error";
-    }
-    @if (Model.HintText != null)
-    {
-        describedBy += (describedBy != "" ? " " : "");
-        describedBy += @Model.Name + "-hint";
-    }
+  var describedBy = "";
+  @if (Model.HasError)
+  {
+    describedBy = @Model.Name + "-error";
+  }
+  @if (Model.HintText != null)
+  {
+    describedBy += (describedBy != "" ? " " : "");
+    describedBy += @Model.Name + "-hint";
+  }
 }
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")" style="white-space:nowrap">
-    <label class="nhsuk-label" for="@Model.Name">
-        @Model.Label
-    </label>
-    @if (Model.HintText != null)
-    {
-        <div class="nhsuk-hint" id="@Model.Name-hint">
-            @Model.HintText
-        </div>
-    }
-    @if (Model.HasError)
-    {
-        <div id="@Model.Name-error" class="nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
-            @foreach (var errorMessage in Model.ErrorMessages)
-            {
-                <span class="error-message--margin-bottom-1 nhsuk-error-message">
-                    <span class="nhsuk-u-visually-hidden">Error:</span> @errorMessage
-                </span>
-            }
-        </div>
-    }
-    <input class="nhsuk-input @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
-           id="@Model.Id"
-           name="@Model.Name"
-           value="@Model.Value"
-           type="@Model.Type"
-           spellcheck="@Model.SpellCheck"
-           autocomplete="@Model.Autocomplete"
-           aria-invalid="@(Model.HasError ? "true" : null)"
-           aria-describedby="@(describedBy!= "" ? @describedBy : null)" />
+  <label class="nhsuk-label" for="@Model.Name">
+    @Model.Label
+  </label>
+  @if (Model.HintText != null)
+  {
+    <div class="nhsuk-hint" id="@Model.Name-hint">
+      @Html.Raw(Model.HintText)
+    </div>
+  }
+  @if (Model.HasError)
+  {
+    <div id="@Model.Name-error" class="nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
+      @foreach (var errorMessage in Model.ErrorMessages)
+      {
+        <span class="error-message--margin-bottom-1 nhsuk-error-message">
+          <span class="nhsuk-u-visually-hidden">Error:</span> @errorMessage
+        </span>
+      }
+    </div>
+  }
+  <input class="nhsuk-input @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
+         id="@Model.Id"
+         name="@Model.Name"
+         value="@Model.Value"
+         type="@Model.Type"
+         spellcheck="@Model.SpellCheck"
+         autocomplete="@Model.Autocomplete"
+         aria-invalid="@(Model.HasError ? "true" : null )"
+         aria-describedby="@(describedBy!= "" ? @describedBy : null)"
+         aria-required="@(Model.Required ? "true" : "false" )" />
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/_EditRegistrationNumber.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_EditRegistrationNumber.cshtml
index 576819e38a..dafa8a2298 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/_EditRegistrationNumber.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/_EditRegistrationNumber.cshtml
@@ -74,7 +74,8 @@
                        spell-check="false"
                        hint-text=""
                        autocomplete="off"
-                       css-class="nhsuk-u-width-one-half" />
+                       css-class="nhsuk-u-width-one-half"
+                       required="true" />
       </div>
     </div>
   </fieldset>
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/MyStaffList.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/MyStaffList.cshtml
index 90701a07ab..47ad59a299 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/MyStaffList.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/MyStaffList.cshtml
@@ -49,8 +49,8 @@
               <partial name="SearchablePage/_TopPagination" model="Model" />
               <partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
 
-              <input type="hidden" id="select-sort-by" value="SearchableName" />
-              <input type="hidden" id="select-sort-direction" value="Ascending" />
+              <input type="hidden" aria-hidden="true" id="select-sort-by" value="SearchableName" />
+              <input type="hidden" aria-hidden="true" id="select-sort-direction" value="Ascending" />
               @if (Model.SuperviseDelegateDetailViewModels.Any()) {
                 <div id="searchable-elements">
                   @foreach (var supervisorDelegateDetail in Model.SuperviseDelegateDetailViewModels) {
@@ -86,7 +86,8 @@
                              spell-check="false"
                              hint-text="Provide the work email address of a member of staff to add to your supervision list."
                              autocomplete="email"
-                             css-class="nhsuk-input" />
+                             css-class="nhsuk-input"
+                             required="true" />
             </div>
           </div>
           <button class="nhsuk-button" type="submit" asp-action="AddSuperviseDelegate">
diff --git a/DigitalLearningSolutions.Web/Views/Support/Faqs/Faqs.cshtml b/DigitalLearningSolutions.Web/Views/Support/Faqs/Faqs.cshtml
index 49c20a19a9..507a895035 100644
--- a/DigitalLearningSolutions.Web/Views/Support/Faqs/Faqs.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Support/Faqs/Faqs.cshtml
@@ -29,8 +29,8 @@
       <h1 class="nhsuk-heading-xl">FAQs</h1>
 
       <partial name="SearchablePage/_Search" model="Model" />
-      <input type="hidden" id="select-sort-by" value="@Model.SortBy" data-sort-by-multiple="true" />
-      <input type="hidden" id="select-sort-direction" value="@Model.SortDirection" />
+      <input type="hidden" aria-hidden="true" id="select-sort-by" value="@Model.SortBy" data-sort-by-multiple="true" />
+      <input type="hidden" aria-hidden="true" id="select-sort-direction" value="@Model.SortDirection" />
 
       @if (Model.NoDataFound) {
         <p class="nhsuk-u-margin-top-4" role="alert">
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/EditAdminRoles.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/EditAdminRoles.cshtml
index 0918d59c8f..c34692538c 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/EditAdminRoles.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/EditAdminRoles.cshtml
@@ -45,7 +45,8 @@
                    label="Please select a content manager role for this user."
                    populate-with-current-values="true"
                    radios="@Model.Radios"
-                   hint-text="" />
+                   hint-text=""
+                   required="true"/>
       </div>
 
       <h2 class="nhsuk-heading-l nhsuk-u-margin-top-8">Learning category</h2>
@@ -54,7 +55,7 @@
                       label="Learning category"
                       value="@Model.LearningCategory.ToString()"
                       hint-text="Limits the permissions of the administrator to view and manage courses in a particular category."
-                      deselectable="true"
+                      required="false"
                       css-class="nhsuk-u-width-one-half"
                       default-option=""
                       select-list-options="@Model.LearningCategories" />
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreDetails.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreDetails.cshtml
index 1a4a93cc0e..d229923d5b 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreDetails.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreDetails.cshtml
@@ -32,7 +32,8 @@
                          spell-check="false"
                          autocomplete="email"
                          hint-text=""
-                         css-class="nhsuk-u-width-one-half" />
+                         css-class="nhsuk-u-width-one-half"
+                         required="true" />
 
           <vc:text-input asp-for="BannerText"
                          label="Centre support details"
@@ -41,13 +42,14 @@
                          spell-check="true"
                          autocomplete="off"
                          hint-text=""
-                         css-class="nhsuk-u-width-one-half" />
+                         css-class="nhsuk-u-width-one-half"
+                         required="true" />
         </div>
       </div>
 
       <div class="nhsuk-grid-row nhsuk-u-margin-bottom-2">
         <div class="nhsuk-grid-column-one-half">
-          <input type="hidden" asp-for="CentreSignature" />
+          <input type="hidden" aria-hidden="true" asp-for="CentreSignature" />
           <vc:file-input asp-for="CentreSignatureFile" label="Centre signature" hint-text="@string.Format(hintText, "signature")" css-class="nhsuk-u-width-full" />
         </div>
         <div class="nhsuk-grid-column-one-half">
@@ -68,7 +70,7 @@
 
       <div class="nhsuk-grid-row nhsuk-u-margin-bottom-2">
         <div class="nhsuk-grid-column-one-half">
-          <input type="hidden" asp-for="CentreLogo" />
+          <input type="hidden" aria-hidden="true" asp-for="CentreLogo" />
           <vc:file-input asp-for="CentreLogoFile" label="Centre logo" hint-text="@string.Format(hintText, "logo")" css-class="nhsuk-u-width-full" />
         </div>
         <div class="nhsuk-grid-column-one-half">
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreManagerDetails.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreManagerDetails.cshtml
index 085e46e5df..f3e1002e74 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreManagerDetails.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreManagerDetails.cshtml
@@ -22,7 +22,8 @@
                      spell-check="false"
                      autocomplete="given-name"
                      hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true"/>
 
       <vc:text-input asp-for="LastName"
                      label="Last name"
@@ -30,7 +31,8 @@
                      type="text" spell-check="false"
                      autocomplete="family-name"
                      hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="Email"
                      label="Email"
@@ -39,7 +41,8 @@
                      spell-check="false"
                      autocomplete="email"
                      hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="Telephone"
                      label="Telephone (optional)"
@@ -48,7 +51,8 @@
                      spell-check="false"
                      autocomplete=""
                      hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="false"/>
 
       <button class="nhsuk-button" type="submit" value="save">Save</button>
     </form>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreWebsiteDetails.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreWebsiteDetails.cshtml
index 9ef1fee00f..dd5cd645b2 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreWebsiteDetails.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/EditCentreWebsiteDetails.cshtml
@@ -31,7 +31,8 @@
                      populate-with-current-value="true"
                      type="text" spell-check="false"
                      autocomplete="" hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="false" />
 
       <vc:text-input asp-for="CentreEmail"
                      label="Centre email"
@@ -39,7 +40,8 @@
                      type="text" spell-check="false"
                      autocomplete="email"
                      hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="CentrePostcode"
                      label="Centre postcode"
@@ -48,7 +50,8 @@
                      spell-check="false"
                      autocomplete=""
                      hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <vc:text-input asp-for="OpeningHours"
                      label="Opening hours"
@@ -57,7 +60,8 @@
                      spell-check="false"
                      autocomplete=""
                      hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="false" />
 
       <vc:text-input asp-for="CentreWebAddress"
                      label="Centre web address"
@@ -65,7 +69,8 @@
                      type="text" spell-check="false"
                      autocomplete=""
                      hint-text=""
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="false" />
 
       <vc:text-area asp-for="OrganisationsCovered"
                     label="Organisations covered"
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/AddRegistrationPromptConfigureAnswers.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/AddRegistrationPromptConfigureAnswers.cshtml
index 9080c03f66..e709ae49c8 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/AddRegistrationPromptConfigureAnswers.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/AddRegistrationPromptConfigureAnswers.cshtml
@@ -38,7 +38,8 @@
                        spell-check="true"
                        autocomplete=""
                        hint-text=""
-                       css-class="nhsuk-u-width-one-half" />
+                       css-class="nhsuk-u-width-one-half"
+                       required="false" />
         <button name="action" class="nhsuk-button nhsuk-button--secondary" value="@RegistrationPromptsController.AddPromptAction">Add</button>
       </div>
 
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/AddRegistrationPromptSelectPrompt.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/AddRegistrationPromptSelectPrompt.cshtml
index 57cf573bc8..61ec953324 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/AddRegistrationPromptSelectPrompt.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/AddRegistrationPromptSelectPrompt.cshtml
@@ -19,7 +19,7 @@
                       label="Prompt name"
                       value="@Model.CustomPromptId?.ToString()"
                       hint-text=""
-                      deselectable="false"
+                      required="true"
                       css-class="nhsuk-u-width-one-half"
                       default-option="Select a prompt name"
                       select-list-options="@ViewBag.CustomPromptNameOptions" />
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/EditRegistrationPrompt.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/EditRegistrationPrompt.cshtml
index 5dbd4608d1..054b8c1eb0 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/EditRegistrationPrompt.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/EditRegistrationPrompt.cshtml
@@ -60,7 +60,8 @@
                      spell-check="true"
                      autocomplete=""
                      hint-text=""
-                     css-class="nhsuk-u-width-full" />
+                     css-class="nhsuk-u-width-full"
+                     required="false" />
       <button name="action" class="nhsuk-button nhsuk-button--secondary" value="@RegistrationPromptsController.AddPromptAction">Add</button>
     </div>
   </div>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/RemoveRegistrationPrompt.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/RemoveRegistrationPrompt.cshtml
index 5650a833f4..1533be46e8 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/RemoveRegistrationPrompt.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Configuration/RegistrationPrompts/RemoveRegistrationPrompt.cshtml
@@ -50,8 +50,8 @@
           </div>
         </fieldset>
       </div>
-      <input type="hidden" asp-for="PromptName" />
-      <input type="hidden" asp-for="DelegateCount" />
+      <input type="hidden" aria-hidden="true" asp-for="PromptName" />
+      <input type="hidden" aria-hidden="true" asp-for="DelegateCount" />
       <button class="nhsuk-button delete-button nhsuk-button--secondary" type="submit">Delete prompt</button>
     </form>
 
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Ranking/Index.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Ranking/Index.cshtml
index 2f72c8ace7..9ae9733aea 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Ranking/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Ranking/Index.cshtml
@@ -27,7 +27,7 @@
                       label="Region"
                       value="@Model.RegionId.ToString()"
                       hint-text=""
-                      deselectable="true"
+                      required="false"
                       css-class="nhsuk-u-width-full"
                       default-option="All"
                       select-list-options="@Model.RegionOptions" />
@@ -37,7 +37,7 @@
                       label="Period"
                       value="@Model.Period?.Id.ToString()"
                       hint-text=""
-                      deselectable="true"
+                      required="false"
                       css-class="nhsuk-u-width-full"
                       default-option="@null"
                       select-list-options="@Model.PeriodOptions" />
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Reports/EditFilters.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Reports/EditFilters.cshtml
index de4cc02a5b..fa28e27cc1 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Reports/EditFilters.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Reports/EditFilters.cshtml
@@ -33,7 +33,7 @@
                       label="Choose job group filter"
                       value="@Model.JobGroupId.ToString()"
                       hint-text=""
-                      deselectable="true"
+                      required="false"
                       css-class="nhsuk-u-width-one-half"
                       default-option="All"
                       select-list-options="@Model.JobGroupOptions" />
@@ -57,7 +57,7 @@
                       label="Report by"
                       value="@reportIntervalValue.ToString()"
                       hint-text=""
-                      deselectable="false"
+                      required="true"
                       css-class="nhsuk-u-width-one-half"
                       default-option=""
                       select-list-options="@Model.ReportIntervalOptions" />
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Reports/_EditCourseCategoryFilters.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Reports/_EditCourseCategoryFilters.cshtml
index 7302b550fd..2464aadf4d 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Reports/_EditCourseCategoryFilters.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Reports/_EditCourseCategoryFilters.cshtml
@@ -36,7 +36,7 @@
                           label="Choose a course"
                           value="@Model.CustomisationId.ToString()"
                           hint-text=""
-                          deselectable="true"
+                          required="false"
                           css-class="nhsuk-u-width-one-half"
                           default-option="All"
                           select-list-options="@Model.CustomisationOptions" />
@@ -61,7 +61,7 @@
                           label="Choose course category from the list below"
                           value="@Model.CourseCategoryId.ToString()"
                           hint-text=""
-                          deselectable="true"
+                          required="false"
                           css-class="nhsuk-u-width-one-half"
                           default-option="All"
                           select-list-options="@Model.CourseCategoryOptions" />
@@ -75,7 +75,7 @@
                   label="Choose a course filter"
                   value="@Model.CustomisationId.ToString()"
                   hint-text=""
-                  deselectable="true"
+                  required="false"
                   css-class="nhsuk-u-width-one-half"
                   default-option="All"
                   select-list-options="@Model.CustomisationOptions" />
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/AddAdminField.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/AddAdminField.cshtml
index e24c9176c2..d674418b1a 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/AddAdminField.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/AddAdminField.cshtml
@@ -23,7 +23,7 @@
                       label="Field name"
                       value="@Model.AdminFieldId.ToString()"
                       hint-text=""
-                      deselectable="false"
+                      required="true"
                       css-class="nhsuk-u-width-one-half"
                       default-option="Select a field name"
                       select-list-options="@ViewBag.AdminFieldNameOptions" />
@@ -49,7 +49,8 @@
                          spell-check="true"
                          autocomplete=""
                          hint-text=""
-                         css-class="nhsuk-u-width-full" />
+                         css-class="nhsuk-u-width-full"
+                         required="false" />
           <button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.AddPromptAction">Add</button>
         </div>
       </div>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/EditAdminField.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/EditAdminField.cshtml
index 728b444916..c79f9698c5 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/EditAdminField.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/EditAdminField.cshtml
@@ -44,7 +44,8 @@
                          spell-check="true"
                          autocomplete=""
                          hint-text=""
-                         css-class="nhsuk-u-width-full" />
+                         css-class="nhsuk-u-width-full"
+                         required="false" />
           <button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.AddPromptAction">Add</button>
         </div>
       </div>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/ManageCourse/EditAutoRefreshOptions.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/ManageCourse/EditAutoRefreshOptions.cshtml
index 265791820f..2f16c41054 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/ManageCourse/EditAutoRefreshOptions.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/ManageCourse/EditAutoRefreshOptions.cshtml
@@ -30,7 +30,7 @@
                       label="Course to refresh to"
                       value="@Model.RefreshToCustomisationId.ToString()"
                       hint-text="Which course should the learner be enrolled on when auto-refreshing?"
-                      deselectable="false"
+                      required="true"
                       css-class="nhsuk-u-width-one-half"
                       default-option="Select a course"
                       select-list-options="@Model.CourseOptions" />
@@ -40,7 +40,8 @@
                         populate-with-current-value="true"
                         type="text"
                         hint-text="How many months prior to expiry of the previous course should the learner be enrolled on the refresher course?"
-                        css-class="nhsuk-input--width-10" />
+                        css-class="nhsuk-input--width-10"
+                        required="false"/>
 
       <vc:single-checkbox asp-for="@nameof(Model.ApplyLpDefaultsToSelfEnrol)"
                           label="Apply to self-enrolments"
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/ManageCourse/EditLearningPathwayDefaults.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/ManageCourse/EditLearningPathwayDefaults.cshtml
index 492b2a734a..a2e05de413 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/ManageCourse/EditLearningPathwayDefaults.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/ManageCourse/EditLearningPathwayDefaults.cshtml
@@ -22,21 +22,23 @@
           asp-route-customisationId="@Model.CustomisationId">
 
       <vc:numeric-input asp-for="@nameof(Model.CompleteWithinMonths)"
-                        label="Completion within (in months)"
+                        label="Completion within - months"
                         populate-with-current-value="true"
                         type="text"
                         hint-text="Within how many months of enrolment (up to 48) should the learner complete the
                                      course? Enter 0 or leave blank if you do not wish to configure this value."
-                        css-class="nhsuk-input--width-10" />
+                        css-class="nhsuk-input--width-10"
+                        required="false"/>
 
       <vc:numeric-input asp-for="@nameof(Model.ValidityMonths)"
-                        label="Completion valid for (in months)"
+                        label="Completion valid for - months"
                         populate-with-current-value="true"
                         type="text"
                         hint-text="For how many months after completion (up to 48) will the completion remain valid, before the
                                      learner is expected to complete the course again? Enter 0 or leave blank if you do not wish
                                      to configure this value."
-                        css-class="nhsuk-input--width-10 nhsuk-u-margin-bottom-2" />
+                        css-class="nhsuk-input--width-10 nhsuk-u-margin-bottom-2"
+                        required="false" />
 
       <vc:single-checkbox asp-for="@nameof(Model.Mandatory)"
                           label="Course is mandatory"
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCourseName.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCourseName.cshtml
index 03a25fdd29..f2e789661e 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCourseName.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCourseName.cshtml
@@ -23,6 +23,7 @@
                    spell-check="true"
                    autocomplete="off"
                    hint-text=""
-                   css-class="nhsuk-u-width-three-quarters nhsuk-u-font-weight-normal" />
+                   css-class="nhsuk-u-width-three-quarters nhsuk-u-font-weight-normal"
+                   required="false"/>
   </div>
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCoursePasswordAndEmail.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCoursePasswordAndEmail.cshtml
index 58700f4af4..3f066e8034 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCoursePasswordAndEmail.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCoursePasswordAndEmail.cshtml
@@ -34,7 +34,8 @@
                          spell-check="false"
                          autocomplete="off"
                          hint-text=""
-                         css-class="nhsuk-u-width-one-half" />
+                         css-class="nhsuk-u-width-one-half"
+                         required="true" />
         </div>
       </div>
 
@@ -57,7 +58,8 @@
                        spell-check="false"
                        autocomplete="off"
                        hint-text=""
-                       css-class="nhsuk-u-width-one-half" />
+                       css-class="nhsuk-u-width-one-half"
+                       required="true" />
       </div>
 
     </div>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_OtherCompletionCriteriaInputs.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_OtherCompletionCriteriaInputs.cshtml
index 0c00146cc2..dae6dde8f5 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_OtherCompletionCriteriaInputs.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_OtherCompletionCriteriaInputs.cshtml
@@ -6,7 +6,8 @@
                   populate-with-current-value="true"
                   type="text"
                   hint-text=""
-                  css-class="nhsuk-input--width-10 nhsuk-u-margin-bottom-2" />
+                  css-class="nhsuk-input--width-10 nhsuk-u-margin-bottom-2"
+                  required="false" />
 
 @if (Model.DiagAssess) {
   <vc:numeric-input asp-for="@nameof(Model.DiagCompletionThreshold)"
@@ -14,5 +15,6 @@
                     populate-with-current-value="true"
                     type="text"
                     hint-text=""
-                    css-class="nhsuk-input--width-10 nhsuk-u-margin-bottom-2" />
+                    css-class="nhsuk-input--width-10 nhsuk-u-margin-bottom-2"
+                    required="false"/>
 }
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/AddDelegateGroup.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/AddDelegateGroup.cshtml
index 1375abd23d..2cc02eafbb 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/AddDelegateGroup.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/AddDelegateGroup.cshtml
@@ -31,7 +31,8 @@
                      spell-check="true"
                      hint-text=""
                      autocomplete=""
-                     css-class="nhsuk-u-width-two-thirds" />
+                     css-class="nhsuk-u-width-two-thirds"
+                     required="true" />
 
       <vc:text-area asp-for="@nameof(Model.GroupDescription)"
                     label="Group description (optional)"
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/EditGroupName.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/EditGroupName.cshtml
index 70171a9a0e..0ada1369b1 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/EditGroupName.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/EditGroupName.cshtml
@@ -24,7 +24,8 @@
                      spell-check="false"
                      hint-text=""
                      autocomplete="off"
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <button class="nhsuk-button" type="submit" value="save">Save</button>
     </form>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/GenerateGroups.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/GenerateGroups.cshtml
index a6a10b3637..3191294b9b 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/GenerateGroups.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateGroups/GenerateGroups.cshtml
@@ -23,7 +23,7 @@
                       label="Registration field"
                       value="@Model.RegistrationFieldOptionId.ToString()"
                       hint-text="This is the delegate registration field that the group generation will be based on."
-                      deselectable="false"
+                      required="true"
                       css-class="nhsuk-u-width-full nhsuk-u-margin-bottom-2"
                       default-option="Select a registration field"
                       select-list-options="@Model.RegistrationFieldOptions" />
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/EditDelegateCourseAdminField.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/EditDelegateCourseAdminField.cshtml
index 33dff16097..0988a9119d 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/EditDelegateCourseAdminField.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/EditDelegateCourseAdminField.cshtml
@@ -64,7 +64,8 @@
                            spell-check="true"
                            autocomplete=""
                            hint-text="Answer must be 100 characters or fewer."
-                           css-class="nhsuk-u-width-full" />
+                           css-class="nhsuk-u-width-full"
+                           required="false" />
           }
 
           <button class="nhsuk-button" type="submit">Save</button>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/EditSupervisor.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/EditSupervisor.cshtml
index 666f285232..a1321937b7 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/EditSupervisor.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/EditSupervisor.cshtml
@@ -33,7 +33,7 @@
                       label="Supervisor"
                       value="@Model.SupervisorId.ToString()"
                       hint-text=""
-                      deselectable="true"
+                      required="false"
                       css-class="nhsuk-u-width-one-half"
                       default-option="No supervisor"
                       select-list-options="@Model.Supervisors" />
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EditDelegate/Index.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EditDelegate/Index.cshtml
index d352854f2b..a00f8021b7 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EditDelegate/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EditDelegate/Index.cshtml
@@ -43,7 +43,8 @@
                        spell-check="false"
                        autocomplete="given-name"
                        hint-text=""
-                       css-class="nhsuk-u-width-one-half" />
+                       css-class="nhsuk-u-width-one-half"
+                       required="true" />
 
         <vc:text-input asp-for="@nameof(Model.LastName)"
                        label="Last name"
@@ -52,7 +53,8 @@
                        spell-check="false"
                        autocomplete="family-name"
                        hint-text=""
-                       css-class="nhsuk-u-width-one-half" />
+                       css-class="nhsuk-u-width-one-half"
+                       required="true" />
 
         <vc:text-input asp-for="@nameof(Model.Email)"
                        label="Email"
@@ -61,7 +63,8 @@
                        spell-check="false"
                        autocomplete="email"
                        hint-text=""
-                       css-class="nhsuk-u-width-one-half" />
+                       css-class="nhsuk-u-width-one-half"
+                       required="true" />
 
         <vc:text-input asp-for="@nameof(Model.AliasId)"
                        label="Alias"
@@ -70,7 +73,8 @@
                        spell-check="false"
                        autocomplete=""
                        hint-text=""
-                       css-class="nhsuk-u-width-one-half" />
+                       css-class="nhsuk-u-width-one-half"
+                       required="false" />
 
         <partial name="_EditRegistrationNumber" model="@Model" />
       </div>
@@ -79,7 +83,7 @@
                       label="Job group"
                       value="@Model.JobGroupId.ToString()"
                       hint-text=""
-                      deselectable="false"
+                      required="true"
                       css-class="nhsuk-u-width-one-half"
                       default-option="Select a job group"
                       select-list-options="@Model.JobGroups" />
@@ -90,7 +94,7 @@
                           label="@(customField.Prompt + (customField.Mandatory ? "" : " (optional)"))"
                           value="@customField.Answer"
                           hint-text=""
-                          deselectable="@(!customField.Mandatory)"
+                          required="@(customField.Mandatory)"
                           css-class="nhsuk-u-width-one-half"
                           default-option="Select a @customField.Prompt.ToLower()"
                           select-list-options="@customField.Options" />
@@ -102,7 +106,8 @@
                          spell-check="false"
                          autocomplete=""
                          hint-text=""
-                         css-class="nhsuk-u-width-one-half" />
+                         css-class="nhsuk-u-width-one-half"
+                         required="@customField.Mandatory" />
         }
       }
 
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/GroupCourses/AddCourseToGroup.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/GroupCourses/AddCourseToGroup.cshtml
index 436eefc105..dec9b51894 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/GroupCourses/AddCourseToGroup.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/GroupCourses/AddCourseToGroup.cshtml
@@ -30,17 +30,18 @@
                       label="Supervisor"
                       value="@Model.SupervisorId.ToString()"
                       hint-text=""
-                      deselectable="true"
                       css-class="nhsuk-u-width-one-half"
                       default-option="No supervisor"
-                      select-list-options="@Model.Supervisors" />
+                      select-list-options="@Model.Supervisors"
+                      required="false"/>
 
       <vc:numeric-input asp-for="@nameof(Model.MonthsToComplete)"
                         label="Months that course needs to be completed within"
                         populate-with-current-value="true"
                         type="text"
                         hint-text=""
-                        css-class="nhsuk-u-width-one-half" />
+                        css-class="nhsuk-u-width-one-half"
+                        required="false"/>
 
       <a class="nhsuk-button nhsuk-button--secondary" asp-controller="GroupCourses" asp-action="AddCourseToGroupSelectCourse" asp-route-groupId="@Model.GroupId">Back</a>
       <button class="nhsuk-button" type="submit">Add course</button>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/PromoteToAdmin/Index.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/PromoteToAdmin/Index.cshtml
index d0ec66ac8c..896af2d10d 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/PromoteToAdmin/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/PromoteToAdmin/Index.cshtml
@@ -55,7 +55,8 @@
                    label="Please select a content manager role for this user."
                    populate-with-current-values="true"
                    radios="@Model.Radios"
-                   hint-text="" />
+                   hint-text=""
+                   required="true" />
       </div>
 
       <h2 class="nhsuk-heading-l nhsuk-u-margin-top-8">Learning category</h2>
@@ -64,7 +65,7 @@
                       label="Learning category"
                       value="@Model.LearningCategory.ToString()"
                       hint-text="Limits the permissions of the administrator to view and manage courses in a particular category."
-                      deselectable="true"
+                      required="false"
                       css-class="nhsuk-u-width-one-half"
                       default-option=""
                       select-list-options="@Model.LearningCategories" />
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/SetDelegatePassword/Index.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/SetDelegatePassword/Index.cshtml
index ab627ffa1a..f9e35311e4 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/SetDelegatePassword/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/SetDelegatePassword/Index.cshtml
@@ -28,7 +28,8 @@
                      spell-check="false"
                      autocomplete="off"
                      hint-text="Password should have a minimum of 8 characters with at least 1 letter, 1 number and 1 symbol."
-                     css-class="nhsuk-u-width-one-half" />
+                     css-class="nhsuk-u-width-one-half"
+                     required="true" />
 
       <button class="nhsuk-button" type="submit">Save</button>
     </form>