diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
index 71714fb5e..003a78163 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
@@ -24,7 +24,8 @@
     }
 }
 
-
+@if (showPaging == true)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -68,4 +69,5 @@
             }
         </ul>
     </nav>
+}
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
index 37c56f917..9232336fb 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
@@ -24,7 +24,8 @@
     }
 }
 
-
+@if (showPaging == true)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -68,4 +69,5 @@
             }
         </ul>
     </nav>
+}
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
index 81eccb142..3a3ea02f8 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
@@ -24,10 +24,11 @@
     }
 }
 
-
+@if (showPaging == true)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
-    <ul class="nhsuk-list nhsuk-pagination__list">
-            
+        <ul class="nhsuk-list nhsuk-pagination__list">
+
             @if (pagingModel.CurrentPage <= 1)
             {
                 <li class="nhsuk-pagination-item--previous">
@@ -68,4 +69,5 @@
             }
         </ul>
     </nav>
+}
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
index 78df5e67f..0c5f04028 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
@@ -24,7 +24,8 @@
     }
 }
 
-
+@if (showPaging == true)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -68,4 +69,4 @@
             }
         </ul>
     </nav>
-
+}
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
index d46d0c3dd..ac9518fe8 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
@@ -24,7 +24,8 @@
     }
 }
 
-
+@if (showPaging == true)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -68,4 +69,4 @@
             }
         </ul>
     </nav>
-
+}
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml
index f07ce1500..9f5a28e14 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml
@@ -22,48 +22,49 @@
     }
 }
 
+@if (showPaging == true)
+{
+    <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
+        <ul class="nhsuk-list nhsuk-pagination__list">
 
-<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
-    <ul class="nhsuk-list nhsuk-pagination__list">
+            @if (pagingModel.CurrentPage <= 1)
+            {
+                <li class="nhsuk-pagination-item--previous">
 
-        @if (pagingModel.CurrentPage <= 1)
-        {
-            <li class="nhsuk-pagination-item--previous">
-
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--previous">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangeCurrentRole" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Previous</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@previousMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-        @if (pagingModel.CurrentPage == pagingModel.TotalPages)
-        {
-            <li class="nhsuk-pagination-item--next">
-
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--next">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangeCurrentRole" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Next</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@nextMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-    </ul>
-</nav>
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--previous">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangeCurrentRole" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Previous</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@previousMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+            @if (pagingModel.CurrentPage == pagingModel.TotalPages)
+            {
+                <li class="nhsuk-pagination-item--next">
 
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--next">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangeCurrentRole" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Next</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@nextMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+        </ul>
+    </nav>
+}
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml
index 137e6072b..f7513314d 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml
@@ -22,48 +22,50 @@
     }
 }
 
+@if (showPaging == true)
+{
+    <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
+        <ul class="nhsuk-list nhsuk-pagination__list">
 
-<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
-    <ul class="nhsuk-list nhsuk-pagination__list">
+            @if (pagingModel.CurrentPage <= 1)
+            {
+                <li class="nhsuk-pagination-item--previous">
 
-        @if (pagingModel.CurrentPage <= 1)
-        {
-            <li class="nhsuk-pagination-item--previous">
-
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--previous">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangePrimarySpecialty" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Previous</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@previousMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-        @if (pagingModel.CurrentPage == pagingModel.TotalPages)
-        {
-            <li class="nhsuk-pagination-item--next">
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--previous">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangePrimarySpecialty" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Previous</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@previousMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+            @if (pagingModel.CurrentPage == pagingModel.TotalPages)
+            {
+                <li class="nhsuk-pagination-item--next">
 
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--next">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangePrimarySpecialty" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Next</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@nextMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-    </ul>
-</nav>
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--next">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangePrimarySpecialty" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Next</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@nextMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+        </ul>
+    </nav>
+}
 
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml
index 04f149fbf..fb6fb7e5a 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml
@@ -22,48 +22,49 @@
     }
 }
 
+@if (showPaging == true)
+{
+    <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
+        <ul class="nhsuk-list nhsuk-pagination__list">
 
-<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
-    <ul class="nhsuk-list nhsuk-pagination__list">
+            @if (pagingModel.CurrentPage <= 1)
+            {
+                <li class="nhsuk-pagination-item--previous">
 
-        @if (pagingModel.CurrentPage <= 1)
-        {
-            <li class="nhsuk-pagination-item--previous">
-
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--previous">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangeWorkPlace" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Previous</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@previousMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-        @if (pagingModel.CurrentPage == pagingModel.TotalPages)
-        {
-            <li class="nhsuk-pagination-item--next">
-
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--next">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangeWorkPlace" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Next</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@nextMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-    </ul>
-</nav>
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--previous">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangeWorkPlace" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Previous</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@previousMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+            @if (pagingModel.CurrentPage == pagingModel.TotalPages)
+            {
+                <li class="nhsuk-pagination-item--next">
 
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--next">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangeWorkPlace" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Next</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@nextMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+        </ul>
+    </nav>
+}
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml
index 9d0e60544..7ff229639 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml
@@ -28,46 +28,49 @@
     previousRouteData["MyLearningFormActionType"] = MyLearningFormActionTypeEnum.PreviousPageChange.ToString();
 }
 
-<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
-    <ul class="nhsuk-list nhsuk-pagination__list">
+@if (showPaging == true)
+{
+    <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
+        <ul class="nhsuk-list nhsuk-pagination__list">
 
-        @if (pagingModel.CurrentPage <= 0)
-        {
-            <li class="nhsuk-pagination-item--previous">
+            @if (pagingModel.CurrentPage <= 0)
+            {
+                <li class="nhsuk-pagination-item--previous">
 
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--previous">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="Index" asp-all-route-data="@previousRouteData">
-                    <span class="nhsuk-pagination__title">Previous</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@previousMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-        @if (pagingModel.CurrentPage >= pagingModel.TotalPages - 1)
-        {
-            <li class="nhsuk-pagination-item--next">
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--previous">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="Index" asp-all-route-data="@previousRouteData">
+                        <span class="nhsuk-pagination__title">Previous</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@previousMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+            @if (pagingModel.CurrentPage >= pagingModel.TotalPages - 1)
+            {
+                <li class="nhsuk-pagination-item--next">
 
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--next">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="Index" asp-all-route-data="@nextRouteData">
-                    <span class="nhsuk-pagination__title">Next</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@nextMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-    </ul>
-</nav>
\ No newline at end of file
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--next">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="Index" asp-all-route-data="@nextRouteData">
+                        <span class="nhsuk-pagination__title">Next</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@nextMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+        </ul>
+    </nav>
+}
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml
index dca9f2bce..a1ab36e1a 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml
@@ -21,7 +21,7 @@
 
                 @if (this.ViewBag.EmptyFeedbackError == true)
                 {
-                    <span class="nhsuk-error-message nhsuk-u-padding-bottom-2">
+                    <span class="nhsuk-error-message nhsuk-u-padding-bottom-2" role="status">
                         <span class="nhsuk-u-visually-hidden">Error:</span> You must provide feedback
                     </span>
                 }