diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Date.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Date.cshtml
index 115be1e2..48ae3c61 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Date.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Date.cshtml
@@ -19,6 +19,7 @@
                             @Model.Question
                         </h1>
                     </legend>
+                    
                     <div id="date-format-hint" class="govuk-hint">@Model.QuestionHint</div>
 
                     @if (Model.HasErrors)
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
index d3677508..8fae340d 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
@@ -25,25 +25,27 @@
         {
             <fieldset class="govuk-fieldset govuk-!-margin-bottom-4">
                 <div class="govuk-form-group @(Model.HasErrors ? "govuk-form-group--error" : "")">
-                    <h1 class="govuk-heading-l" id="question">
-                        @Model.Question
-                    </h1>
-                    
+                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+                        <h1 class="govuk-heading-l" id="question">
+                            @Model.Question
+                        </h1>
+                    </legend>
+
                     <h1 class="govuk-label-wrapper">
                         @Html.Label(Model.DropdownId, Model.DropdownHeading, new { @class = "govuk-label govuk-fieldset__legend--m" })
                     </h1>
 
                     @if (Model.HasErrors)
                     {
-                    <p id="dropdown-error" class="govuk-error-message">
-                        <span class="govuk-visually-hidden">Error:</span> @Model.ErrorMessage
-                    </p>
+                        <p id="dropdown-error" class="govuk-error-message">
+                            <span class="govuk-visually-hidden">Error:</span> @Model.ErrorMessage
+                        </p>
                     }
 
                     <div class="govuk-form-group">
                         @Html.DropDownListFor(x => x.SelectedValue, Model.Values, new { @class = Model.HasErrors ? "govuk-select govuk-select--error" : "govuk-select", id = Model.DropdownId })
                     </div>
-                    
+
                     <div class="govuk-checkboxes__item">
                         @Html.CheckBoxFor(x => x.NotInTheList, new { @class = "govuk-checkboxes__input", id = Model.CheckboxId, name = "awarding-organisation" })
                         @Html.Label(Model.CheckboxId, Model.NotInListText, new { @class = "govuk-label govuk-checkboxes__label" })
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Radio.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Radio.cshtml
index 095a7d60..b5cc2f29 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Radio.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Radio.cshtml
@@ -14,9 +14,11 @@
         {
             <fieldset class="govuk-fieldset govuk-!-margin-bottom-4">
                 <div class="govuk-form-group @(Model.HasErrors ? "govuk-form-group--error" : "")">
-                    <h1 class="govuk-heading-l" id="question">
-                        @Model.Question
-                    </h1>
+                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+                        <h1 class="govuk-heading-l" id="question">
+                            @Model.Question
+                        </h1>
+                    </legend>
 
                     @if (!string.IsNullOrEmpty(Model.AdditionalInformationHeader) && !string.IsNullOrEmpty(Model.AdditionalInformationBody))
                     {