diff --git a/DigitalLearningSolutions.Data.Migrations/202109080846_FixCompetencyIDFKConstraint.cs b/DigitalLearningSolutions.Data.Migrations/202109080846_FixCompetencyIDFKConstraint.cs
new file mode 100644
index 0000000000..82a8728035
--- /dev/null
+++ b/DigitalLearningSolutions.Data.Migrations/202109080846_FixCompetencyIDFKConstraint.cs
@@ -0,0 +1,18 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+    [Migration(202109080846)]
+    public class FixCompetencyIDFKConstraint : Migration
+    {
+        public override void Up()
+        {
+            Delete.ForeignKey("FK_CompetencyAssessmentQuestions_AssessmentQuestionID_Competencies_ID").OnTable("CompetencyAssessmentQuestions");
+            Alter.Column("AssessmentQuestionID").OnTable("CompetencyAssessmentQuestions").AsInt32().NotNullable().ForeignKey("AssessmentQuestions", "ID");
+        }
+        public override void Down()
+        {
+            Delete.ForeignKey("FK_CompetencyAssessmentQuestions_AssessmentQuestionID_AssessmentQuestionID_ID").OnTable("CompetencyAssessmentQuestions");
+            Alter.Column("AssessmentQuestionID").OnTable("CompetencyAssessmentQuestions").AsInt32().NotNullable().ForeignKey("Competencies", "ID");
+        }
+    }
+}
diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss
index 5b9aa16256..adf22a1379 100644
--- a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss
+++ b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss
@@ -1,5 +1,6 @@
 @import "~nhsuk-frontend/packages/core/all";
-
+@import "../shared/headingButtons";
+@import "../shared/searchableElements/searchableElements"; 
 $nhs-dark-grey: #425563;
 
 .tags {
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionConfirm.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionConfirm.cshtml
index 9813ecb4ac..296d4aa932 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionConfirm.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionConfirm.cshtml
@@ -49,6 +49,9 @@
 <div class="nhsuk-card nhsuk-u-padding-4">
   <partial name="../Shared/_AssessmentQuestionPreview.cshtml" model="Model.AssessmentQuestion" />
 </div>
+<a class="nhsuk-button nhsuk-button--secondary" asp-action="EditAssessmentQuestionOptions" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
+  Back
+</a>
 @if (Model.FrameworkCompetencyId == 0 && Model.AssessmentQuestion.Id == 0)
 {
   @if (Model.DetailFramework.PublishStatusID == 3)
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionLevelDescriptor.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionLevelDescriptor.cshtml
index 76b696716f..14e3b1c93e 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionLevelDescriptor.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionLevelDescriptor.cshtml
@@ -38,6 +38,7 @@
     </div>
   </nav>
 }
+<h1>@Model.AssessmentQuestionDetail.Question</h1>
 <form method="post">
   @if (!ViewData.ModelState.IsValid)
   {
@@ -45,9 +46,6 @@
   }
   <fieldset class="nhsuk-fieldset">
     <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-      <p class="nhsuk-fieldset__heading">
-        @Model.AssessmentQuestionDetail.Question
-      </p>
       <p class="nhsuk-fieldset__heading">
         @if (Model.AssessmentQuestionDetail.AssessmentQuestionInputTypeID == 3)
         {
@@ -77,11 +75,11 @@
         {
 
           if (Model.LevelDescriptor.LevelValue == 0)
-                {
+          {
             <text>No or false option label
             </text>
           }
-                else
+          else
           {
             <text>Yes or true option label
             </text>
@@ -95,10 +93,9 @@
       <div class="nhsuk-hint" id="tb-levelLabel-@Model.LevelDescriptor.LevelValue-hint">
         How will this radio button option be labelled?
       </div>
-      <span nhs-validation-for="LevelDescriptor.LevelLabel"></span>
       <input class="nhsuk-input" id="tb-levelLabel-@Model.LevelDescriptor.LevelValue" asp-for="@Model.LevelDescriptor.LevelLabel" error-class-toggle="nhsuk-input--error" name="LevelLabel" type="text">
     </nhs-form-group>
-    <div class="nhsuk-form-group">
+    <nhs-form-group nhs-validation-for="LevelDescriptor.LevelDescription">
       <label class="nhsuk-label" for="tb-levelDescription-@Model.LevelDescriptor.LevelValue">
         @if (Model.AssessmentQuestionDetail.AssessmentQuestionInputTypeID == 3)
         {
@@ -123,11 +120,23 @@
         What additional description (if any) should be provided for this radio button option?
       </div>
       <textarea class="nhsuk-input text-area-edit-90" placeholder="Optional" id="tb-levelDescription-@Model.LevelDescriptor.LevelValue" asp-for="@Model.LevelDescriptor.LevelDescription" name="LevelDescription" type="text"></textarea>
-    </div>
-    <input name="ID" type="hidden" asp-for="@Model.LevelDescriptor.ID" />
-    <input name="LevelValue" type="hidden" asp-for="@Model.LevelDescriptor.LevelValue" />
-    <input name="UpdatedByAdminID" type="hidden" asp-for="@Model.LevelDescriptor.UpdatedByAdminID" />
-  </fieldset>
+      </nhs-form-group>
+      <input name="ID" type="hidden" asp-for="@Model.LevelDescriptor.ID" />
+      <input name="LevelValue" type="hidden" asp-for="@Model.LevelDescriptor.LevelValue" />
+      <input name="UpdatedByAdminID" type="hidden" asp-for="@Model.LevelDescriptor.UpdatedByAdminID" />
+</fieldset>
+  @if (Model.LevelDescriptor.LevelValue > Model.AssessmentQuestionDetail.MinValue)
+  {
+    <a class="nhsuk-button nhsuk-button--secondary" asp-action="AssessmentQuestionLevelDescriptor" asp-route-level="@((int)Model.LevelDescriptor.LevelValue-1)" asp-route-frameworkId="@Model.FrameworkId" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
+      Back
+    </a>
+  }
+  else
+  {
+    <a class="nhsuk-button nhsuk-button--secondary" asp-action="EditAssessmentQuestionScoring" asp-route-frameworkId="@Model.FrameworkId" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
+      Back
+    </a>
+  }
   <button class="nhsuk-button" type="submit">
     Next
   </button>
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionOptions.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionOptions.cshtml
index 0d8a1b5ab0..bf1cca281e 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionOptions.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionOptions.cshtml
@@ -39,12 +39,13 @@
     </div>
   </nav>
 }
+<h1>@Model.AssessmentQuestionDetail.Question</h1>
 <form method="post">
   <fieldset class="nhsuk-fieldset">
     <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-      <h1 class="nhsuk-fieldset__heading">
-        @Model.AssessmentQuestionDetail.Question - Options
-      </h1>
+      <span class="nhsuk-fieldset__heading">
+         Assessment Question Options
+      </span>
     </legend>
     <div class="nhsuk-form-group">
       <label class="nhsuk-label" for="tb-scoringInstructions">
@@ -79,8 +80,6 @@
         </div>
       </div>
     </div>
-    @*<input name="IncludeComments" type="hidden" asp-for="AssessmentQuestionDetail.IncludeComments" />
-      <input name="ScoringInstructions" type="hidden" asp-for="AssessmentQuestionDetail.ScoringInstructions" />*@
     <input name="ID" type="hidden" asp-for="AssessmentQuestionDetail.ID" />
     <input name="MinValue" type="hidden" asp-for="AssessmentQuestionDetail.MinValue" />
     <input name="MaxValue" type="hidden" asp-for="AssessmentQuestionDetail.MaxValue" />
@@ -92,6 +91,19 @@
     <input name="AddedByAdminId" type="hidden" asp-for="AssessmentQuestionDetail.AddedByAdminId" />
     <input name="UserIsOwner" type="hidden" asp-for="AssessmentQuestionDetail.UserIsOwner" />
   </fieldset>
+  @if (Model.AssessmentQuestionDetail.AssessmentQuestionInputTypeID != 2)
+  {
+    <a class="nhsuk-button nhsuk-button--secondary" asp-action="AssessmentQuestionLevelDescriptor" asp-route-level="@Model.AssessmentQuestionDetail.MaxValue" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
+      Back
+    </a>
+  }
+  else
+  {
+    <a class="nhsuk-button nhsuk-button--secondary" asp-action="EditAssessmentQuestionScoring" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
+      Back
+    </a>
+  }
+
   <button class="nhsuk-button" type="submit">
     Next
   </button>
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionScoring.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionScoring.cshtml
index 6af6771327..57dd3ed562 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionScoring.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AssessmentQuestionScoring.cshtml
@@ -38,15 +38,15 @@
     </div>
   </nav>
 }
-
+<h1>@Model.AssessmentQuestionDetail.Question</h1>
 <form method="post">
   <fieldset class="nhsuk-fieldset">
     @if (Model.AssessmentQuestionDetail.AssessmentQuestionInputTypeID == 2)
     {
       <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-        <h1 class="nhsuk-fieldset__heading">
-          @Model.AssessmentQuestionDetail.Question - @Model.AssessmentQuestionDetail.Question - Scoring range
-        </h1>
+        <span class="nhsuk-fieldset__heading">
+          Scoring range
+        </span>
       </legend>
       <div class="nhsuk-form-group">
         <label class="nhsuk-label" for="tb-minValue">
@@ -90,9 +90,9 @@
     else
     {
       <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
-        <h1 class="nhsuk-fieldset__heading">
-          @Model.AssessmentQuestionDetail.Question - Radio button options
-        </h1>
+        <span class="nhsuk-fieldset__heading">
+          Radio button options
+        </span>
       </legend>
       <input name="MinValue" type="hidden" asp-for="AssessmentQuestionDetail.MinValue" value="1" />
       <input name="MinValueDescription" type="hidden" asp-for="AssessmentQuestionDetail.MinValueDescription" />
@@ -113,7 +113,9 @@
     <input name="IncludeComments" type="hidden" asp-for="AssessmentQuestionDetail.IncludeComments" />
     <input name="ScoringInstructions" type="hidden" asp-for="AssessmentQuestionDetail.ScoringInstructions" />
   </fieldset>
-
+  <a class="nhsuk-button nhsuk-button--secondary" asp-action="EditAssessmentQuestion" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-assessmentQuestionId="@ViewContext.RouteData.Values["assessmentQuestionId"]"  asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
+    Back
+  </a>
   <button class="nhsuk-button" type="submit">
     Next
   </button>