diff --git a/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml b/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml
index 8200e11d84..1b4bb670fb 100644
--- a/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml
@@ -17,20 +17,17 @@
     {
         <div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
             <div class="nhsuk-card nhsuk-card--clickable">
-                <div class="nhsuk-card__content  beta-card__content">
+                <div class="nhsuk-card__content nhsuk-card__content--primary">
                     <h2 class="nhsuk-card__heading nhsuk-heading-m">
                         <a class="nhsuk-card__link" asp-controller="LearningPortal" asp-action="Current">Learning Portal</a>
                     </h2>
                     <p class="nhsuk-card__description">Access to your current, available and completed learning courses.</p>
-                </div>
-                <div class="beta-hub-arrow">
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
-                     xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
-                        <circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
-                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
-                       stroke-miterlimit="10" stroke-width="2.667">
-                            <path d="M15.438 13l-3.771 3.771">
-                            </path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
+
+                    <svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
+                        <circle cx="13.333" cy="13.333" r="13.333" fill="" />
+                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
+                            <path d="M15.438 13l-3.771 3.771" />
+                            <path data-name="Path" d="M11.667 9.229L15.438 13" />
                         </g>
                     </svg>
                 </div>
@@ -41,7 +38,7 @@
     {
         <div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
             <div class="nhsuk-card nhsuk-card--clickable">
-                <div class="nhsuk-card__content beta-card__content">
+                <div class="nhsuk-card__content nhsuk-card__content--primary">
                     <h2 class="nhsuk-card__heading nhsuk-heading-m">
                         <feature name="@(FeatureFlags.RefactoredTrackingSystem)">
                             <a class="nhsuk-card__link" asp-controller="Dashboard" asp-action="Index">Tracking System</a>
@@ -51,15 +48,12 @@
                         </feature>
                     </h2>
                     <p class="nhsuk-card__description">Manage and distribute learning to your organisation and access reports.</p>
-                </div>
-                <div class="beta-hub-arrow">
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
-                     xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
-                        <circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
-                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
-                       stroke-miterlimit="10" stroke-width="2.667">
-                            <path d="M15.438 13l-3.771 3.771">
-                            </path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
+
+                    <svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
+                        <circle cx="13.333" cy="13.333" r="13.333" fill="" />
+                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
+                            <path d="M15.438 13l-3.771 3.771" />
+                            <path data-name="Path" d="M11.667 9.229L15.438 13" />
                         </g>
                     </svg>
                 </div>
@@ -69,7 +63,7 @@
             <feature name="@(FeatureFlags.RefactoredTrackingSystem)">
                 <div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
                     <div class="nhsuk-card nhsuk-card--clickable">
-                        <div class="nhsuk-card__content beta-card__content">
+                        <div class="nhsuk-card__content nhsuk-card__content--primary">
                             <h2 class="nhsuk-card__heading nhsuk-heading-m">
                                 <a class="nhsuk-card__link" href="@Configuration.GetCurrentSystemBaseUrl()/tracking/dashboard">Legacy Tracking System</a>
                             </h2>
@@ -77,18 +71,15 @@
                                 Access the old Tracking System if you can't find the functionality you need in the new one.
                                 Please raise a ticket to tell us about any missing functionality, too.
                             </p>
-                        </div>
-                        <div class="beta-hub-arrow">
-                            <svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
-                             xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
-                                <circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
-                                <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
-                               stroke-miterlimit="10" stroke-width="2.667">
-                                    <path d="M15.438 13l-3.771 3.771">
-                                    </path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
+                            <svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
+                                <circle cx="13.333" cy="13.333" r="13.333" fill="" />
+                                <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
+                                    <path d="M15.438 13l-3.771 3.771" />
+                                    <path data-name="Path" d="M11.667 9.229L15.438 13" />
                                 </g>
                             </svg>
                         </div>
+
                     </div>
                 </div>
             </feature>
@@ -98,20 +89,16 @@
     {
         <div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
             <div class="nhsuk-card nhsuk-card--clickable">
-                <div class="nhsuk-card__content beta-card__content">
+                <div class="nhsuk-card__content nhsuk-card__content--primary">
                     <h2 class="nhsuk-card__heading nhsuk-heading-m">
                         <a class="nhsuk-card__link" href="@Configuration.GetCurrentSystemBaseUrl()/cms/courses">Content Management System</a>
                     </h2>
                     <p class="nhsuk-card__description">Import and manage learning content that's delivered through the Digital Learning Solutions platform.</p>
-                </div>
-                <div class="beta-hub-arrow">
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
-                     xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
-                        <circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
-                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
-                       stroke-miterlimit="10" stroke-width="2.667">
-                            <path d="M15.438 13l-3.771 3.771">
-                            </path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
+                    <svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
+                        <circle cx="13.333" cy="13.333" r="13.333" fill="" />
+                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
+                            <path d="M15.438 13l-3.771 3.771" />
+                            <path data-name="Path" d="M11.667 9.229L15.438 13" />
                         </g>
                     </svg>
                 </div>
@@ -122,20 +109,16 @@
     {
         <div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
             <div class="nhsuk-card nhsuk-card--clickable">
-                <div class="nhsuk-card__content beta-card__content">
+                <div class="nhsuk-card__content nhsuk-card__content--primary">
                     <h2 class="nhsuk-card__heading nhsuk-heading-m">
                         <a class="nhsuk-card__link" asp-controller="Supervisor" asp-action="Index">Supervise</a>
                     </h2>
                     <p class="nhsuk-card__description">Assign and review staff profile assessments and arrange supervision sessions.</p>
-                </div>
-                <div class="beta-hub-arrow">
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
-                     xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
-                        <circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
-                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
-                       stroke-miterlimit="10" stroke-width="2.667">
-                            <path d="M15.438 13l-3.771 3.771">
-                            </path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
+                    <svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
+                        <circle cx="13.333" cy="13.333" r="13.333" fill="" />
+                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
+                            <path d="M15.438 13l-3.771 3.771" />
+                            <path data-name="Path" d="M11.667 9.229L15.438 13" />
                         </g>
                     </svg>
                 </div>
@@ -146,20 +129,16 @@
     {
         <div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
             <div class="nhsuk-card nhsuk-card--clickable">
-                <div class="nhsuk-card__content beta-card__content">
+                <div class="nhsuk-card__content nhsuk-card__content--primary">
                     <h2 class="nhsuk-card__heading nhsuk-heading-m">
                         <a class="nhsuk-card__link" href="@Configuration.GetCurrentSystemBaseUrl()/cms/contentcreator">Content Creator</a>
                     </h2>
                     <p class="nhsuk-card__description">Create interactive elearning and assessments.</p>
-                </div>
-                <div class="beta-hub-arrow">
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
-                     xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
-                        <circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
-                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
-                       stroke-miterlimit="10" stroke-width="2.667">
-                            <path d="M15.438 13l-3.771 3.771">
-                            </path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
+                    <svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
+                        <circle cx="13.333" cy="13.333" r="13.333" fill="" />
+                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
+                            <path d="M15.438 13l-3.771 3.771" />
+                            <path data-name="Path" d="M11.667 9.229L15.438 13" />
                         </g>
                     </svg>
                 </div>
@@ -170,20 +149,16 @@
     {
         <div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
             <div class="nhsuk-card nhsuk-card--clickable">
-                <div class="nhsuk-card__content beta-card__content">
+                <div class="nhsuk-card__content nhsuk-card__content--primary">
                     <h2 class="nhsuk-card__heading nhsuk-heading-m">
                         <a class="nhsuk-card__link" asp-controller="Frameworks" asp-action="Index">Frameworks</a>
                     </h2>
                     <p class="nhsuk-card__description">Create and distribute competency frameworks and role profiles.</p>
-                </div>
-                <div class="beta-hub-arrow">
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
-                     xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
-                        <circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
-                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
-                       stroke-miterlimit="10" stroke-width="2.667">
-                            <path d="M15.438 13l-3.771 3.771">
-                            </path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
+                    <svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
+                        <circle cx="13.333" cy="13.333" r="13.333" fill="" />
+                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
+                            <path d="M15.438 13l-3.771 3.771" />
+                            <path data-name="Path" d="M11.667 9.229L15.438 13" />
                         </g>
                     </svg>
                 </div>
@@ -194,7 +169,7 @@
     {
         <div class="nhsuk-grid-column-one-half nhsuk-card-group__item">
             <div class="nhsuk-card nhsuk-card--clickable">
-                <div class="nhsuk-card__content beta-card__content">
+                <div class="nhsuk-card__content nhsuk-card__content--primary">
                     <h2 class="nhsuk-card__heading nhsuk-heading-m">
                         <feature name="@(FeatureFlags.RefactoredSuperAdminInterface)">
                             <a class="nhsuk-card__link" asp-controller="Users" asp-action="Index">Super Admin</a>
@@ -204,15 +179,11 @@
                         </feature>
                     </h2>
                     <p class="nhsuk-card__description">Manage content and settings across the whole system.</p>
-                </div>
-                <div class="beta-hub-arrow">
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right-circle"
-                     xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true">
-                        <circle cx="13.333" cy="13.333" r="13.333" fill="#005eb8"></circle>
-                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round"
-                       stroke-miterlimit="10" stroke-width="2.667">
-                            <path d="M15.438 13l-3.771 3.771">
-                            </path><path data-name="Path" d="M11.667 9.229L15.438 13"></path>
+                    <svg class="nhsuk-icon" xmlns="http://www.w3.org/2000/svg" width="27" height="27" aria-hidden="true" focusable="false">
+                        <circle cx="13.333" cy="13.333" r="13.333" fill="" />
+                        <g data-name="Group 1" fill="none" stroke="#fff" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2.667">
+                            <path d="M15.438 13l-3.771 3.771" />
+                            <path data-name="Path" d="M11.667 9.229L15.438 13" />
                         </g>
                     </svg>
                 </div>
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
index e9e97c5bbf..61eca271ee 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
@@ -1,5 +1,6 @@
 @inject IConfiguration Configuration
 @using DigitalLearningSolutions.Data.Extensions
+@using DigitalLearningSolutions.Web.Helpers
 @using DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments
 @using Microsoft.Extensions.Configuration
 @model SelfAssessmentOverviewViewModel
@@ -113,7 +114,7 @@
                         </summary>
                         <div class="nhsuk-details__text">
                             <partial name="SelfAssessments/_CompetencySummary" view-data="@competencySummariesEnumerator.Current" />
-                            @if (!String.IsNullOrEmpty(groupDetails.CompetencyGroupDescription))
+                            @if (!String.IsNullOrEmpty(StringHelper.StripHtmlTags(groupDetails.CompetencyGroupDescription)))
                             {
                                 <p class="nhsuk-body-l nhsuk-u-margin-left-7">@Html.Raw(groupDetails.CompetencyGroupDescription)</p>
                             }
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/Index.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/Index.cshtml
index 038d127f84..0228ecd8ea 100644
--- a/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/Index.cshtml
@@ -53,23 +53,23 @@
                         </div>
                         <div class="nhsuk-grid-row">
                             <div class="filter-container nhsuk-u-margin-top-5">
-                                <div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
+                                <div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-4">
                                     <vc:select-list asp-for="@nameof(Model.UserStatus)"
                                                     label="User status"
                                                     value="@Model.UserStatus"
                                                     required="true"
                                                     hint-text=""
-                                                    css-class="nhsuk-grid-column-full nhsuk-u-width-full"
+                                                    css-class=""
                                                     default-option=""
                                                     select-list-options="@ViewBag.UserStatus" />
                                 </div>
-                                <div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
+                                <div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-4">
                                     <vc:select-list asp-for="@nameof(Model.EmailStatus)"
                                                     label="Email status"
                                                     value="@Model.EmailStatus"
                                                     required="true"
                                                     hint-text=""
-                                                    css-class="nhsuk-grid-column-full nhsuk-u-width-full"
+                                                    css-class=""
                                                     default-option=""
                                                     select-list-options="@ViewBag.EmailStatus" />
                                 </div>
@@ -79,7 +79,7 @@
                                                     value="@Model.JobGroupId.ToString()"
                                                     hint-text=""
                                                     required="true"
-                                                    css-class="nhsuk-grid-column-full  nhsuk-u-width-full"
+                                                    css-class=""
                                                     default-option=""
                                                     select-list-options="@ViewBag.JobGroups" />
                                 </div>