diff --git a/NHSUKViewComponents.Web/ViewComponents/RadioListViewComponent.cs b/NHSUKViewComponents.Web/ViewComponents/RadioListViewComponent.cs
index 401abcc..7f7045d 100644
--- a/NHSUKViewComponents.Web/ViewComponents/RadioListViewComponent.cs
+++ b/NHSUKViewComponents.Web/ViewComponents/RadioListViewComponent.cs
@@ -17,7 +17,8 @@ public IViewComponentResult Invoke(
             bool required,
             string? requiredClientSideErrorMessage = default,
             string cssClass = default,
-            string? optionalRadio = default
+            string? optionalRadio = default,
+            bool? isPageHeading = false
         )
         {
             var model = ViewData.Model;
@@ -46,7 +47,8 @@ public IViewComponentResult Invoke(
                 errorMessages,
                 required,
                 string.IsNullOrEmpty(requiredClientSideErrorMessage) ? null : requiredClientSideErrorMessage,
-                string.IsNullOrEmpty(cssClass) ? null : cssClass
+                string.IsNullOrEmpty(cssClass) ? null : cssClass,
+                isPageHeading
             );
 
             return View(viewModel);
diff --git a/NHSUKViewComponents.Web/ViewModels/RadiosViewModel.cs b/NHSUKViewComponents.Web/ViewModels/RadiosViewModel.cs
index 9932e96..4b71805 100644
--- a/NHSUKViewComponents.Web/ViewModels/RadiosViewModel.cs
+++ b/NHSUKViewComponents.Web/ViewModels/RadiosViewModel.cs
@@ -14,7 +14,8 @@ public RadiosViewModel(
             IEnumerable<string> errorMessages,
             bool required,
             string? requiredClientSideErrorMessage = default,
-            string? cssClass = default
+            string? cssClass = default,
+            bool? isPageHeading = false
         )
         {
             var errorMessageList = errorMessages.ToList();
@@ -28,6 +29,7 @@ public RadiosViewModel(
             Required = required;
             RequiredClientSideErrorMessage = requiredClientSideErrorMessage;
             Class = cssClass;
+            IsPageHeading = isPageHeading;
         }
 
         public string AspFor { get; set; }
@@ -41,6 +43,7 @@ public RadiosViewModel(
 
         public IEnumerable<RadiosItemViewModel> Radios { get; set; }
         public RadiosItemViewModel OptionalRadio { get; set; }
+        public bool? IsPageHeading { get; set; }
         public bool Required { get; set; }
         public string RequiredClientSideErrorMessage { get; set; }
     }
diff --git a/NHSUKViewComponents.Web/Views/Shared/Components/DateInput/Default.cshtml b/NHSUKViewComponents.Web/Views/Shared/Components/DateInput/Default.cshtml
index 444d561..6322ba4 100644
--- a/NHSUKViewComponents.Web/Views/Shared/Components/DateInput/Default.cshtml
+++ b/NHSUKViewComponents.Web/Views/Shared/Components/DateInput/Default.cshtml
@@ -10,19 +10,19 @@
 
 <div class="@Model.CssClass @errorCss" id="@Model.Id">
   <fieldset class="nhsuk-fieldset" aria-describedby="@Model.Id-hint" role="group">
-        <legend class="nhsuk-fieldset__legend @(Model.IsPageHeading.GetValueOrDefault() ? "nhsuk-fieldset__legend--l":"nhsuk-label")">
-        @if(Model.IsPageHeading.GetValueOrDefault()==true)
-        {
-            <h1 class="nhsuk-fieldset__heading">
+        <legend class="nhsuk-fieldset__legend nhsuk-label">
+            @if (Model.IsPageHeading.GetValueOrDefault() == true)
+            {
+                <h1>
+                    @Model.Label
+                </h1>
+            }
+            else
+            {
                 @Model.Label
-            </h1>
-        }
-        else
-        {
-              @Model.Label
-        }
-
-    </legend>
+            }
+        </legend>
+        
     @if (Model.HintTextLines != null) {
       @foreach (var hintText in Model.HintTextLines) {
         <div class="nhsuk-hint">
diff --git a/NHSUKViewComponents.Web/Views/Shared/Components/RadioList/Default.cshtml b/NHSUKViewComponents.Web/Views/Shared/Components/RadioList/Default.cshtml
index 5f4c7e9..2be1623 100644
--- a/NHSUKViewComponents.Web/Views/Shared/Components/RadioList/Default.cshtml
+++ b/NHSUKViewComponents.Web/Views/Shared/Components/RadioList/Default.cshtml
@@ -11,9 +11,18 @@
 
     <fieldset class="nhsuk-fieldset" aria-describedby="@Model.Label.RemoveWhitespace()-hint">
         <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
-            <label class="nhsuk-fieldset__heading">
-                @Model.Label
-            </label>
+            @if (Model.IsPageHeading.GetValueOrDefault() == true)
+            {
+                <h1>
+                    @Model.Label
+                </h1>
+            }
+            else
+            {
+                <label class="nhsuk-fieldset__heading">
+                    @Model.Label
+                </label>
+            }
         </legend>
 
         @if (Model.HintText != null)