diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
index 2581f964b9..a237225278 100644
--- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
+++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
@@ -480,7 +480,7 @@ public IActionResult ViewSelectedCompetencies(int competencyAssessmentId)
 
             var competencies = competencyAssessmentService.GetCompetenciesForCompetencyAssessment(competencyAssessmentId);
             var linkedFrameworks = competencyAssessmentService.GetLinkedFrameworksForCompetencyAssessment(competencyAssessmentId);
-            if (!competencies.Any())
+            if (!linkedFrameworks.Any())
             {
                 return RedirectToAction("AddCompetenciesSelectFramework", new { competencyAssessmentId });
             }
@@ -604,8 +604,6 @@ public IActionResult DeleteCompetencyGroup(int competencyAssessmentId, int compe
             competencyAssessmentService.RemoveCompetencyGroupFromAssessment(competencyAssessmentId, competencyGroupId);
             return RedirectToAction("ViewSelectedCompetencies", new { competencyAssessmentId });
         }
-
-
         public IActionResult MoveCompetencyInSelfAssessment(int competencyAssessmentId, int competencyId, string direction)
         {
             var adminId = GetAdminID();
@@ -632,7 +630,7 @@ public IActionResult ViewSelectedCompetencies(ViewSelectedCompetenciesFormData m
         {
             if (model.TaskStatus == null)
             {
-                model.TaskStatus = false;
+             model.TaskStatus = false;
             }
             competencyAssessmentService.UpdateSelectCompetenciesTaskStatus(model.ID, model.TaskStatus.Value, null);
             return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.ID });
diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/RoleRequirementQuestionCellsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/RoleRequirementQuestionCellsViewModel.cs
index 387d64b63f..18f0c932cc 100644
--- a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/RoleRequirementQuestionCellsViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/RoleRequirementQuestionCellsViewModel.cs
@@ -7,5 +7,6 @@ public class RoleRequirementQuestionCellsViewModel
         public int AssessmentID { get; set; }
         public int CompetencyID { get; set; }
         public int AssessmentQuestionID { get; set; }
+        public string VocabularySingular { get; set; }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml
index ffda5b37d9..cb3910d8cf 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml
@@ -1,7 +1,7 @@
 @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 @model AddCompetenciesViewModel;
 @{
-    ViewData["Title"] = "Add competencies to self-assessment";
+    ViewData["Title"] = $"Add {@Model.VocabularyPlural.ToLower()} to self-assessment";
     ViewData["Application"] = "Framework service";
 }
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
@@ -35,7 +35,6 @@
                     Add @Model.VocabularyPlural.ToLower() to assessment
                 </h1>
             </legend>
-
             @if (Model.GroupedCompetencies.Count() > 0)
             {
                 @foreach (var competencyGroup in Model.GroupedCompetencies)
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
index c4da7a4574..9bc41ed441 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
@@ -69,7 +69,8 @@
                             AssessmentQuestion = competency.Questions.First(),
                             AssessmentID = Model.Id,
                             CompetencyID = competency.CompetencyID,
-                            AssessmentQuestionID = competency.Questions.First().AssessmentQuestionID
+                            AssessmentQuestionID = competency.Questions.First().AssessmentQuestionID,
+                            VocabularySingular = Model.VocabularySingular
                         }
                         )
         </tr>
@@ -83,7 +84,9 @@
                             AssessmentQuestion = question,
                             AssessmentID = Model.Id,
                             CompetencyID = competency.CompetencyID,
-                            AssessmentQuestionID = question.AssessmentQuestionID
+                            AssessmentQuestionID = question.AssessmentQuestionID,
+                            VocabularySingular = Model.VocabularySingular
+
                         }
                         )
         </tr>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml
index a607b8ea7e..a63ebf6644 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml
@@ -156,7 +156,7 @@
             else
             {
                 <div class="nhsuk-task-list__name-and-hint" aria-describedby="select-competencies-status">
-                    <a class="nhsuk-link nhsuk-task-list__link" asp-action="ViewSelectedCompetencies" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
+                    <a class="nhsuk-link nhsuk-task-list__link" asp-action="ViewSelectedCompetencies" asp-route-vocabularyPlural="@Model.VocabularyPlural" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
                         Select @Model.VocabularyPlural.ToLower() to assess
                     </a>
                 </div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_RoleRequirementQuestionCells.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_RoleRequirementQuestionCells.cshtml
index 4af54e1d65..f1e69cb8de 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_RoleRequirementQuestionCells.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_RoleRequirementQuestionCells.cshtml
@@ -28,7 +28,7 @@
 </td>
 
 <td class="nhsuk-table__cell">
-    <a class="nhsuk-link" asp-action="EditQuestionResponseRoleRequirements" asp-route-competencyAssessmentId="@Model.AssessmentID" asp-route-competencyId="@Model.CompetencyID" asp-route-assessmentQuestionId="@Model.AssessmentQuestionID">
+    <a class="nhsuk-link" asp-action="EditQuestionResponseRoleRequirements" asp-route-vocabularySingular="@Model.VocabularySingular" asp-route-competencyAssessmentId="@Model.AssessmentID" asp-route-competencyId="@Model.CompetencyID" asp-route-assessmentQuestionId="@Model.AssessmentQuestionID">
         Change
     </a>
 </td>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml
index 2cb15c3fdc..2d285f8b2e 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml
@@ -1,7 +1,7 @@
 @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 @model ViewSelectedCompetenciesViewModel;
 @{
-    ViewData["Title"] = "Select competencies";
+    ViewData["Title"] = $"Select {@Model.VocabularyPlural.ToLower()} to assess";
     ViewData["Application"] = "Framework service";
     var groupCount = Model.Competencies.Where(c => c.GroupId != 0)
         .GroupBy(c => new { c.FrameworkId, c.FrameworkName, c.GroupId, c.GroupName })
@@ -32,7 +32,7 @@
         @Model.CompetencyAssessmentName
         <span class="nhsuk-u-visually-hidden"> – </span>
     </span>
-    @Model.VocabularyPlural to assess
+    Select @Model.VocabularyPlural.ToLower() to assess
 </h1>
 <h2>Linked frameworks</h2>
 <dl class="nhsuk-summary-list">
@@ -45,7 +45,7 @@
             @if (Model.UserRole > 1)
             {
                 <dd class="nhsuk-summary-list__actions">
-                    <a asp-action="AddCompetencies" asp-route-competencyAssessmentId="@Model.ID" asp-route-frameworkId="@primaryFramework.ID">
+                    <a asp-action="AddCompetencies" asp-route-vocabularyPlural="@Model.VocabularyPlural" asp-route-competencyAssessmentId="@Model.ID" asp-route-frameworkId="@primaryFramework.ID">
                         Add @Model.VocabularyPlural.ToLower()<span class="nhsuk-u-visually-hidden"> @Model.VocabularyPlural.ToLower()</span>
                     </a>
                 </dd>
@@ -64,7 +64,7 @@
             @if (Model.UserRole > 1)
             {
                 <dd class="nhsuk-summary-list__actions">
-                    <a asp-action="AddCompetencies" asp-route-competencyAssessmentId="@Model.ID" asp-route-frameworkId="@framework.ID">
+                    <a asp-action="AddCompetencies" asp-route-vocabularyPlural="@Model.VocabularyPlural" asp-route-competencyAssessmentId="@Model.ID" asp-route-frameworkId="@framework.ID">
                         Add @Model.VocabularyPlural.ToLower()<span class="nhsuk-u-visually-hidden"> @Model.VocabularyPlural.ToLower()</span>
                     </a>
                 </dd>
@@ -73,6 +73,9 @@
         i++;
     }
 </dl>
+<p> @Model.VocabularyPlural will appear here after you have added them from the frameworks linked to the self-assessment</p>
+<hr class="nhsuk-section-break nhsuk-section-break--m nhsuk-section-break--visible" />
+
 <h2>@Model.VocabularyPlural</h2>
 @{
     int groupNum = 1;
@@ -207,12 +210,9 @@
         }
     }
 }
-else
-{
-     <p> @Model.VocabularyPlural will appear here after you have added them from the frameworks linked to the self-assessment</p>
-    <hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible" />
 
-}
+    
+
 
 <form method="post">
     <input name="ID" type="hidden" asp-for="ID" />