diff --git a/DigitalLearningSolutions.Data.Migrations/202503111500_AddLastAccessedColumn.cs b/DigitalLearningSolutions.Data.Migrations/202503111500_AddLastAccessedColumn.cs
new file mode 100644
index 0000000000..95a0eb6020
--- /dev/null
+++ b/DigitalLearningSolutions.Data.Migrations/202503111500_AddLastAccessedColumn.cs
@@ -0,0 +1,26 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202503111500)]
+    public class AddLastAccessedColumn : Migration
+    {
+        public override void Up()
+        {
+            Alter.Table("Users").AddColumn("LastAccessed").AsDateTime().Nullable();
+            Alter.Table("DelegateAccounts").AddColumn("LastAccessed").AsDateTime().Nullable();
+            Alter.Table("AdminAccounts").AddColumn("LastAccessed").AsDateTime().Nullable();
+
+            Execute.Sql("UPDATE u SET LastAccessed = (SELECT MAX(s.LoginTime) FROM DelegateAccounts da JOIN Sessions s ON da.ID = s.CandidateId WHERE da.UserID = u.ID) FROM users u;");
+            Execute.Sql("UPDATE da SET LastAccessed = (SELECT MAX(s.LoginTime) FROM Sessions s WHERE s.CandidateId = da.ID) FROM DelegateAccounts da;");
+            Execute.Sql("UPDATE da SET LastAccessed = (SELECT ca.LastAccessed FROM CandidateAssessments ca WHERE ca.ID = da.ID) FROM DelegateAccounts da where da.LastAccessed IS NULL;");
+            Execute.Sql("UPDATE AA SET LastAccessed = (SELECT MAX(AdS.LoginTime) FROM AdminSessions AdS WHERE AdS.AdminID = AA.ID) FROM AdminAccounts AA;");
+        }
+        public override void Down()
+        {
+            Delete.Column("LastAccessed").FromTable("Users");
+            Delete.Column("LastAccessed").FromTable("DelegateAccounts");
+            Delete.Column("LastAccessed").FromTable("AdminAccounts");
+        }
+    }
+}
diff --git a/DigitalLearningSolutions.Data.Migrations/2025041161520_Alter_SendExpiredTBCReminders_AppendCourseName.cs b/DigitalLearningSolutions.Data.Migrations/2025041161520_Alter_SendExpiredTBCReminders_AppendCourseName.cs
new file mode 100644
index 0000000000..02bcb19b10
--- /dev/null
+++ b/DigitalLearningSolutions.Data.Migrations/2025041161520_Alter_SendExpiredTBCReminders_AppendCourseName.cs
@@ -0,0 +1,19 @@
+
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(2025041161520)]
+    public class Alter_SendExpiredTBCReminders_AppendCourseName : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_5514_Alter_SendExpiredTBCReminders_Up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_5514_Alter_SendExpiredTBCReminders_Down);
+        }
+    }
+}
diff --git a/DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs b/DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs
index 1b4edf4c6f..ea8a97cc31 100644
--- a/DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs
+++ b/DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs
@@ -2436,6 +2436,50 @@ internal static string TD_5412_Alter_SendExpiredTBCReminders_Up {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to /****** Object:  StoredProcedure [dbo].[SendExpiredTBCReminders]    Script Date: 16/04/2025 10:50:12 ******/
+        ///SET ANSI_NULLS ON
+        ///GO
+        ///
+        ///SET QUOTED_IDENTIFIER ON
+        ///GO
+        ///
+        ///-- =============================================
+        ///-- Author:		Kevin Whittaker
+        ///-- Create date: 17/08/2018
+        ///-- Description:	Uses DB mail to send reminders to delegates on courses with a TBC date within 1 month.
+        ///-- =============================================
+        ///ALTER PROCEDURE [dbo].[SendExpiredTBCReminders]
+        ///	-- Add the parameters for the stor [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string TD_5514_Alter_SendExpiredTBCReminders_Down {
+            get {
+                return ResourceManager.GetString("TD_5514_Alter_SendExpiredTBCReminders_Down", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to /****** Object:  StoredProcedure [dbo].[SendExpiredTBCReminders]    Script Date: 16/04/2025 10:50:12 ******/
+        ///SET ANSI_NULLS ON
+        ///GO
+        ///
+        ///SET QUOTED_IDENTIFIER ON
+        ///GO
+        ///
+        ///-- =============================================
+        ///-- Author:		Kevin Whittaker
+        ///-- Create date: 17/08/2018
+        ///-- Description:	Uses DB mail to send reminders to delegates on courses with a TBC date within 1 month.
+        ///-- =============================================
+        ///ALTER PROCEDURE [dbo].[SendExpiredTBCReminders]
+        ///	-- Add the parameters for the stor [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string TD_5514_Alter_SendExpiredTBCReminders_Up {
+            get {
+                return ResourceManager.GetString("TD_5514_Alter_SendExpiredTBCReminders_Up", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to /****** Object:  StoredProcedure [dbo].[GetActiveAvailableCustomisationsForCentreFiltered_V6]    Script Date: 29/09/2022 19:11:04 ******/
         ///SET ANSI_NULLS ON
diff --git a/DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx b/DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx
index a951c296c9..df856a17ae 100644
--- a/DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx
+++ b/DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx
@@ -475,4 +475,10 @@
   <data name="TD_5412_Alter_SendExpiredTBCReminders_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Scripts\TD-5412-Alter_SendExpiredTBCReminders_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
+  <data name="TD_5514_Alter_SendExpiredTBCReminders_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5514-Alter_SendExpiredTBCReminders_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="TD_5514_Alter_SendExpiredTBCReminders_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5514-Alter_SendExpiredTBCReminders_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/DigitalLearningSolutions.Data.Migrations/Scripts/TD-5514-Alter_SendExpiredTBCReminders_Down.sql b/DigitalLearningSolutions.Data.Migrations/Scripts/TD-5514-Alter_SendExpiredTBCReminders_Down.sql
new file mode 100644
index 0000000000..f80def01d5
Binary files /dev/null and b/DigitalLearningSolutions.Data.Migrations/Scripts/TD-5514-Alter_SendExpiredTBCReminders_Down.sql differ
diff --git a/DigitalLearningSolutions.Data.Migrations/Scripts/TD-5514-Alter_SendExpiredTBCReminders_Up.sql b/DigitalLearningSolutions.Data.Migrations/Scripts/TD-5514-Alter_SendExpiredTBCReminders_Up.sql
new file mode 100644
index 0000000000..448ba42946
Binary files /dev/null and b/DigitalLearningSolutions.Data.Migrations/Scripts/TD-5514-Alter_SendExpiredTBCReminders_Up.sql differ
diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
index 3bdf62f412..a925a1e867 100644
--- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
+++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
@@ -277,13 +277,22 @@ public class FrameworkDataService : IFrameworkDataService
             OwnerAdminID,
             (SELECT Forename + ' ' + Surname + (CASE WHEN Active = 1 THEN '' ELSE ' (Inactive)' END) AS Expr1 FROM AdminUsers WHERE (AdminID = FW.OwnerAdminID)) AS Owner,
             BrandID,
-            CategoryID,
+            FW.CategoryID,
             TopicID,
             CreatedDate,
             PublishStatusID,
             UpdatedByAdminID,
             (SELECT Forename + ' ' + Surname + (CASE WHEN Active = 1 THEN '' ELSE ' (Inactive)' END) AS Expr1 FROM AdminUsers AS AdminUsers_1 WHERE (AdminID = FW.UpdatedByAdminID)) AS UpdatedBy,
-            CASE WHEN FW.OwnerAdminID = @adminId THEN 3 WHEN fwc.CanModify = 1 THEN 2 WHEN fwc.CanModify = 0 THEN 1 ELSE 0 END AS UserRole,
+            CASE
+                WHEN (aa.UserID = (SELECT UserID FROM AdminAccounts WHERE ID = @adminId)) THEN 3
+                WHEN (fwc.CanModify = 1) OR
+                    (SELECT COUNT(*) 
+				        FROM FrameworkCollaborators fc
+				        JOIN AdminAccounts aa1 ON fc.AdminID = aa1.ID
+				        WHERE fc.FrameworkID = fw.ID
+				        AND fc.CanModify = 1 AND fc.IsDeleted = 0
+				        AND aa1.UserID = (SELECT aa2.UserID FROM AdminAccounts aa2 WHERE aa2.ID = 12842)) > 0 THEN 2
+                WHEN fwc.CanModify = 0 THEN 1 ELSE 0 END AS UserRole,
             fwr.ID AS FrameworkReviewID";
 
         private const string BrandedFrameworkFields =
@@ -304,9 +313,9 @@ FROM    CourseTopics
         private const string FlagFields = @"fl.ID AS FlagId, fl.FrameworkId, fl.FlagName, fl.FlagGroup, fl.FlagTagClass";
 
         private const string FrameworkTables =
-            @"Frameworks AS FW LEFT OUTER JOIN
-             FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId AND COALESCE(IsDeleted, 0) = 0
-            LEFT OUTER JOIN FrameworkReviews AS fwr ON fwc.ID = fwr.FrameworkCollaboratorID AND fwr.Archived IS NULL AND fwr.ReviewComplete IS NULL";
+            @"Frameworks AS FW INNER JOIN AdminAccounts AS aa ON aa.ID = fw.OwnerAdminID
+                LEFT OUTER JOIN FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId AND COALESCE(IsDeleted, 0) = 0
+                LEFT OUTER JOIN FrameworkReviews AS fwr ON fwc.ID = fwr.FrameworkCollaboratorID AND fwr.Archived IS NULL AND fwr.ReviewComplete IS NULL";
 
         private const string AssessmentQuestionFields =
             @"SELECT AQ.ID, AQ.Question, AQ.MinValue, AQ.MaxValue, AQ.AssessmentQuestionInputTypeID, AQI.InputTypeName, AQ.AddedByAdminId, CASE WHEN AQ.AddedByAdminId = @adminId THEN 1 ELSE 0 END AS UserIsOwner, AQ.CommentsPrompt, AQ.CommentsHint";
@@ -707,7 +716,7 @@ FROM            [FrameworkCompetencies]
                     new { competencyId, frameworkCompetencyGroupID }
                 );
             }
-            if(addDefaultQuestions)
+            if (addDefaultQuestions)
             {
                 AddDefaultQuestionsToCompetency(competencyId, frameworkId);
             }
diff --git a/DigitalLearningSolutions.Data/DataServices/LoginDataService.cs b/DigitalLearningSolutions.Data/DataServices/LoginDataService.cs
new file mode 100644
index 0000000000..109d5a9273
--- /dev/null
+++ b/DigitalLearningSolutions.Data/DataServices/LoginDataService.cs
@@ -0,0 +1,63 @@
+namespace DigitalLearningSolutions.Data.DataServices
+{
+    using Dapper;
+    using System.Data;
+
+    public interface ILoginDataService
+    {
+        void UpdateLastAccessedForUsersTable(int Id);
+
+        void UpdateLastAccessedForDelegatesAccountsTable(int Id);
+
+        void UpdateLastAccessedForAdminAccountsTable(int Id);
+    }
+
+    public class LoginDataService : ILoginDataService
+    {
+        private readonly IDbConnection connection;
+
+        public LoginDataService(IDbConnection connection)
+        {
+            this.connection = connection;
+        }
+
+        public void UpdateLastAccessedForUsersTable(int Id)
+        {
+            connection.Execute(
+                @"UPDATE Users SET
+                        LastAccessed = GetUtcDate()
+                WHERE ID = @Id",
+                new
+                {
+                    Id
+                }
+            );
+        }
+        
+        public void UpdateLastAccessedForDelegatesAccountsTable(int Id)
+        {
+            connection.Execute(
+                @"UPDATE DelegateAccounts SET
+                        LastAccessed = GetUtcDate()
+                WHERE ID = @Id",
+                new
+                {
+                    Id
+                }
+            );
+        }
+
+        public void UpdateLastAccessedForAdminAccountsTable(int Id)
+        {
+            connection.Execute(
+                @"UPDATE AdminAccounts SET
+                        LastAccessed = GetUtcDate()
+                WHERE ID = @Id",
+                new
+                {
+                    Id
+                }
+            );
+        }
+    }
+}
diff --git a/DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs b/DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs
index d93094c97b..9f293ad394 100644
--- a/DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs
+++ b/DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs
@@ -105,6 +105,7 @@ FROM AdminAccounts AS aa
                 aa.IsSupervisor,
                 aa.IsTrainer,
                 aa.CategoryID,
+                aa.LastAccessed,
                 CASE
                     WHEN aa.CategoryID IS NULL THEN 'All'
                     ELSE cc.CategoryName
@@ -369,7 +370,7 @@ public IEnumerable<AdminAccount> GetAdminAccountsByUserId(int userId)
             }
 
             string BaseSelectQuery = $@"SELECT aa.ID, aa.UserID, aa.CentreID, aa.Active, aa.IsCentreAdmin, aa.IsReportsViewer, aa.IsSuperAdmin, aa.IsCentreManager, 
-		                                aa.IsContentManager, aa.IsContentCreator, aa.IsSupervisor, aa.IsTrainer, aa.CategoryID, aa.IsFrameworkDeveloper, aa.IsFrameworkContributor,aa.ImportOnly,
+		                                aa.LastAccessed, aa.IsContentManager, aa.IsContentCreator, aa.IsSupervisor, aa.IsTrainer, aa.CategoryID, aa.IsFrameworkDeveloper, aa.IsFrameworkContributor,aa.ImportOnly,
 		                                aa.IsWorkforceManager, aa.IsWorkforceContributor, aa.IsLocalWorkforceManager, aa.IsNominatedSupervisor,
 		                                u.ID, u.PrimaryEmail, u.FirstName, u.LastName, u.Active, u.FailedLoginCount,
 		                                c.CentreID, c.CentreName,
diff --git a/DigitalLearningSolutions.Data/DataServices/UserDataService/DelegateUserCardDataService.cs b/DigitalLearningSolutions.Data/DataServices/UserDataService/DelegateUserCardDataService.cs
index 8e2a424ed5..6d08cfc6ae 100644
--- a/DigitalLearningSolutions.Data/DataServices/UserDataService/DelegateUserCardDataService.cs
+++ b/DigitalLearningSolutions.Data/DataServices/UserDataService/DelegateUserCardDataService.cs
@@ -87,6 +87,7 @@ FROM DelegateAccounts AS da
 				c.CentreName,
 				da.CentreID,
 				da.DateRegistered,
+                da.LastAccessed,
 				da.RegistrationConfirmationHash,
 				c.Active AS CentreActive,
 				COALESCE(ucd.Email, u.PrimaryEmail) AS EmailAddress,
@@ -124,6 +125,7 @@ FROM AdminAccounts aa
                 c.CentreName,
                 da.CentreID,
                 da.DateRegistered,
+                da.LastAccessed,
                 da.RegistrationConfirmationHash,
                 c.Active AS CentreActive,
                 COALESCE(ucd.Email, u.PrimaryEmail) AS EmailAddress,
diff --git a/DigitalLearningSolutions.Data/DataServices/UserDataService/UserDataService.cs b/DigitalLearningSolutions.Data/DataServices/UserDataService/UserDataService.cs
index aba887ccf5..178e2f62dc 100644
--- a/DigitalLearningSolutions.Data/DataServices/UserDataService/UserDataService.cs
+++ b/DigitalLearningSolutions.Data/DataServices/UserDataService/UserDataService.cs
@@ -308,6 +308,7 @@ public partial class UserDataService : IUserDataService
                 u.ProfessionalRegistrationNumber,
                 u.ProfileImage,
                 u.Active,
+                u.LastAccessed,
                 u.ResetPasswordID,
                 u.TermsAgreed,
                 u.FailedLoginCount,
@@ -619,6 +620,7 @@ public void UpdateUserDetailsAccount(string firstName, string lastName, string p
                 ce.CentreName,
                 ce.Active AS CentreActive,
                 da.DateRegistered,
+                da.LastAccessed,
                 da.CandidateNumber,
                 da.Approved,
                 da.SelfReg,
diff --git a/DigitalLearningSolutions.Data/Models/SuperAdmin/SuperAdminDelegateAccount.cs b/DigitalLearningSolutions.Data/Models/SuperAdmin/SuperAdminDelegateAccount.cs
index a18268f104..aac978b35a 100644
--- a/DigitalLearningSolutions.Data/Models/SuperAdmin/SuperAdminDelegateAccount.cs
+++ b/DigitalLearningSolutions.Data/Models/SuperAdmin/SuperAdminDelegateAccount.cs
@@ -19,6 +19,7 @@ public SuperAdminDelegateAccount(DelegateEntity delegateEntity)
             LearningHubAuthId = delegateEntity.UserAccount.LearningHubAuthId;
             RegistrationConfirmationHash = delegateEntity.DelegateAccount.RegistrationConfirmationHash;
             DateRegistered = delegateEntity.DelegateAccount.DateRegistered;
+            LastAccessed = delegateEntity.DelegateAccount.LastAccessed;
             SelfReg = delegateEntity.DelegateAccount.SelfReg;
             Active = delegateEntity.DelegateAccount.Active;
             EmailVerified = delegateEntity.UserAccount.EmailVerified;
diff --git a/DigitalLearningSolutions.Data/Models/User/AdminAccount.cs b/DigitalLearningSolutions.Data/Models/User/AdminAccount.cs
index eaff1da52f..51a109785b 100644
--- a/DigitalLearningSolutions.Data/Models/User/AdminAccount.cs
+++ b/DigitalLearningSolutions.Data/Models/User/AdminAccount.cs
@@ -1,5 +1,7 @@
 namespace DigitalLearningSolutions.Data.Models.User
 {
+    using System;
+
     public class AdminAccount
     {
         public int Id { get; set; }
@@ -26,6 +28,7 @@ public class AdminAccount
         public bool IsWorkforceContributor { get; set; }
         public bool IsLocalWorkforceManager { get; set; }
         public bool IsNominatedSupervisor { get; set; }
+        public DateTime? LastAccessed { get; set; }
 
         public bool IsCmsAdministrator => ImportOnly && IsContentManager;
         public bool IsCmsManager => IsContentManager && !ImportOnly;
diff --git a/DigitalLearningSolutions.Data/Models/User/AdminEntity.cs b/DigitalLearningSolutions.Data/Models/User/AdminEntity.cs
index e070aca124..a9b71e5143 100644
--- a/DigitalLearningSolutions.Data/Models/User/AdminEntity.cs
+++ b/DigitalLearningSolutions.Data/Models/User/AdminEntity.cs
@@ -3,6 +3,7 @@
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models.Centres;
     using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
+    using System;
 
     public class AdminEntity : BaseSearchableItem
     {
@@ -72,6 +73,7 @@ public override string SearchableName
         public bool IsSuperAdmin => AdminAccount.IsSuperAdmin;
         public bool IsReportsViewer => AdminAccount.IsReportsViewer;
         public bool IsActive => AdminAccount.Active;
+        public DateTime? LastAccessed => AdminAccount.LastAccessed;
 
     }
 }
diff --git a/DigitalLearningSolutions.Data/Models/User/DelegateAccount.cs b/DigitalLearningSolutions.Data/Models/User/DelegateAccount.cs
index 3f720e350b..66d458fd13 100644
--- a/DigitalLearningSolutions.Data/Models/User/DelegateAccount.cs
+++ b/DigitalLearningSolutions.Data/Models/User/DelegateAccount.cs
@@ -12,6 +12,7 @@ public class DelegateAccount
         public bool CentreActive { get; set; }
         public string CandidateNumber { get; set; } = string.Empty;
         public DateTime DateRegistered { get; set; }
+        public DateTime? LastAccessed { get; set; }
         public string? Answer1 { get; set; }
         public string? Answer2 { get; set; }
         public string? Answer3 { get; set; }
diff --git a/DigitalLearningSolutions.Data/Models/User/DelegateUser.cs b/DigitalLearningSolutions.Data/Models/User/DelegateUser.cs
index 7033b8d13f..f007b355b1 100644
--- a/DigitalLearningSolutions.Data/Models/User/DelegateUser.cs
+++ b/DigitalLearningSolutions.Data/Models/User/DelegateUser.cs
@@ -9,6 +9,7 @@ public class DelegateUser : User
         public int UserId { get; set; }
         public string CandidateNumber { get; set; } = string.Empty;
         public DateTime? DateRegistered { get; set; }
+        public DateTime? LastAccessed { get; set; }
         public int JobGroupId { get; set; }
         public string? JobGroupName { get; set; }
         public string? Answer1 { get; set; }
diff --git a/DigitalLearningSolutions.Data/Models/User/DelegateUserCard.cs b/DigitalLearningSolutions.Data/Models/User/DelegateUserCard.cs
index ed04402308..1e9caf4e9d 100644
--- a/DigitalLearningSolutions.Data/Models/User/DelegateUserCard.cs
+++ b/DigitalLearningSolutions.Data/Models/User/DelegateUserCard.cs
@@ -23,6 +23,7 @@ public DelegateUserCard(DelegateEntity delegateEntity)
             Password = delegateEntity.UserAccount.PasswordHash;
             CandidateNumber = delegateEntity.DelegateAccount.CandidateNumber;
             DateRegistered = delegateEntity.DelegateAccount.DateRegistered;
+            LastAccessed = delegateEntity.DelegateAccount.LastAccessed;
             JobGroupId = delegateEntity.UserAccount.JobGroupId;
             JobGroupName = delegateEntity.UserAccount.JobGroupName;
             Answer1 = delegateEntity.DelegateAccount.Answer1;
diff --git a/DigitalLearningSolutions.Data/Models/User/UserAccount.cs b/DigitalLearningSolutions.Data/Models/User/UserAccount.cs
index 4e1c975bf1..6afca34e14 100644
--- a/DigitalLearningSolutions.Data/Models/User/UserAccount.cs
+++ b/DigitalLearningSolutions.Data/Models/User/UserAccount.cs
@@ -14,6 +14,7 @@ public class UserAccount
         public string? ProfessionalRegistrationNumber { get; set; }
         public byte[]? ProfileImage { get; set; }
         public bool Active { get; set; }
+        public DateTime? LastAccessed { get; set; }
         public int? ResetPasswordId { get; set; }
         public DateTime? TermsAgreed { get; set; }
         public int FailedLoginCount { get; set; }
diff --git a/DigitalLearningSolutions.Web.Tests/Services/LoginServiceTests.cs b/DigitalLearningSolutions.Web.Tests/Services/LoginServiceTests.cs
index f8dad9821e..a77c38f7b8 100644
--- a/DigitalLearningSolutions.Web.Tests/Services/LoginServiceTests.cs
+++ b/DigitalLearningSolutions.Web.Tests/Services/LoginServiceTests.cs
@@ -3,6 +3,7 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models;
@@ -32,6 +33,7 @@ private static readonly (string?, List<(int centreId, string centreName, string
         private LoginService loginService = null!;
         private IUserService userService = null!;
         private IUserVerificationService userVerificationService = null!;
+        private ILoginDataService loginDataService = null!;
 
         [SetUp]
         public void Setup()
@@ -39,7 +41,7 @@ public void Setup()
             userVerificationService = A.Fake<IUserVerificationService>(x => x.Strict());
             userService = A.Fake<IUserService>(x => x.Strict());
 
-            loginService = new LoginService(userService, userVerificationService);
+            loginService = new LoginService(userService, userVerificationService, loginDataService);
         }
 
         [Test]
diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs
index 2cdda2862c..f66bc6427f 100644
--- a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs
+++ b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs
@@ -582,14 +582,33 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
         {
             if (ModelState.IsValid)
             {
+                var flags = frameworkService.GetCustomFlagsByFrameworkId(frameworkId, null)
+                    .Where(fn => fn.FlagName == model.FlagName).ToList();
+
+                bool nameExists = flags.Any(x => x.FlagName == model.FlagName);
+                bool idExists = flags.Any(x => x.FlagId == flagId);
+
                 if (actionname == "Edit")
                 {
-                    frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName, model.FlagGroup, model.FlagTagClass);
+                    if (nameExists && !idExists)
+                    {
+                        ModelState.AddModelError(nameof(model.FlagName), "A custom flag already exists.");
+                        return View("Developer/EditCustomFlag", model);
+                    }
+                    else
+                        frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName, model.FlagGroup, model.FlagTagClass);
                 }
                 else
                 {
-                    frameworkService.AddCustomFlagToFramework(frameworkId, model.FlagName, model.FlagGroup, model.FlagTagClass);
+                    if (nameExists)
+                    {
+                        ModelState.AddModelError(nameof(model.FlagName), "A custom flag already exists.");
+                        return View("Developer/EditCustomFlag", model);
+                    }
+                    else
+                        frameworkService.AddCustomFlagToFramework(frameworkId, model.FlagName, model.FlagGroup, model.FlagTagClass);
                 }
+
                 return RedirectToAction("EditFrameworkFlags", "Frameworks", new { frameworkId });
             }
             return View("Developer/EditCustomFlag", model);
diff --git a/DigitalLearningSolutions.Web/Controllers/LoginController.cs b/DigitalLearningSolutions.Web/Controllers/LoginController.cs
index 20280e18a8..968535144d 100644
--- a/DigitalLearningSolutions.Web/Controllers/LoginController.cs
+++ b/DigitalLearningSolutions.Web/Controllers/LoginController.cs
@@ -82,6 +82,13 @@ public async Task<IActionResult> Index(LoginViewModel model, string timeZone = "
 
             var loginResult = loginService.AttemptLogin(model.Username!.Trim(), model.Password!);
 
+            if (loginResult.LoginAttemptResult == LoginAttemptResult.LogIntoSingleCentre ||
+                loginResult.LoginAttemptResult == LoginAttemptResult.ChooseACentre)
+            {
+                loginService.UpdateLastAccessedForUsersTable(loginResult.UserEntity.UserAccount.Id);
+            }
+
+
             switch (loginResult.LoginAttemptResult)
             {
                 case LoginAttemptResult.InvalidCredentials:
@@ -219,11 +226,17 @@ int centreIdToLogInto
                 IsPersistent = rememberMe,
                 IssuedUtc = clockUtility.UtcNow,
             };
+            var centreAccountSet = userEntity?.GetCentreAccountSet(centreIdToLogInto);
 
-            var adminAccount = userEntity!.GetCentreAccountSet(centreIdToLogInto)?.AdminAccount;
+            if (centreAccountSet?.DelegateAccount?.Id != null)
+            {
+                loginService.UpdateLastAccessedForDelegatesAccountsTable(centreAccountSet.DelegateAccount.Id);
+            }            
 
+            var adminAccount = centreAccountSet?.AdminAccount;
             if (adminAccount?.Active == true)
             {
+                loginService.UpdateLastAccessedForAdminAccountsTable(adminAccount.Id);
                 sessionService.StartAdminSession(adminAccount.Id);
             }
 
diff --git a/DigitalLearningSolutions.Web/Services/DelegateDownloadFileService.cs b/DigitalLearningSolutions.Web/Services/DelegateDownloadFileService.cs
index 7274173d88..e53ee74932 100644
--- a/DigitalLearningSolutions.Web/Services/DelegateDownloadFileService.cs
+++ b/DigitalLearningSolutions.Web/Services/DelegateDownloadFileService.cs
@@ -39,6 +39,7 @@ public class DelegateDownloadFileService : IDelegateDownloadFileService
         private const string ProfessionalRegistrationNumber = "Professional Registration Number";
         private const string JobGroup = "Job group";
         private const string RegisteredDate = "Registered";
+        private const string LastAccessed = "Last Accessed";
         private const string RegistrationComplete = "Registration complete";
         private const string Active = "Active";
         private const string Approved = "Approved";
@@ -333,6 +334,7 @@ DataTable dataTable
                     new DataColumn(ProfessionalRegistrationNumber),
                     new DataColumn(JobGroup),
                     new DataColumn(RegisteredDate),
+                    new DataColumn(LastAccessed),
                 }
             );
 
@@ -374,7 +376,7 @@ CentreRegistrationPrompts registrationPrompts
             );
             row[JobGroup] = delegateRecord.JobGroupName;
             row[RegisteredDate] = delegateRecord.DateRegistered?.Date;
-
+            row[LastAccessed] = delegateRecord.LastAccessed?.Date;
             var delegateAnswers = delegateRecord.GetRegistrationFieldAnswers();
 
             foreach (var prompt in registrationPrompts.CustomPrompts)
@@ -402,7 +404,7 @@ CentreRegistrationPrompts registrationPrompts
         private static void FormatAllDelegateWorksheetColumns(IXLWorkbook workbook, DataTable dataTable)
         {
             ClosedXmlHelper.FormatWorksheetColumn(workbook, dataTable, RegisteredDate, XLDataType.DateTime);
-
+            ClosedXmlHelper.FormatWorksheetColumn(workbook, dataTable, LastAccessed, XLDataType.DateTime);
             var boolColumns = new[] { RegistrationComplete, Active, Approved, IsAdmin };
             foreach (var columnName in boolColumns)
             {
diff --git a/DigitalLearningSolutions.Web/Services/LoginService.cs b/DigitalLearningSolutions.Web/Services/LoginService.cs
index 35d8cc7a16..dc52aca0b5 100644
--- a/DigitalLearningSolutions.Web/Services/LoginService.cs
+++ b/DigitalLearningSolutions.Web/Services/LoginService.cs
@@ -5,10 +5,12 @@
     using System.Linq;
     using System.Security.Claims;
     using System.Threading.Tasks;
+    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models;
     using DigitalLearningSolutions.Data.Models.User;
+    using DigitalLearningSolutions.Data.Utilities;
     using DigitalLearningSolutions.Data.ViewModels;
     using DigitalLearningSolutions.Web.Helpers;
     using Microsoft.AspNetCore.Authentication;
@@ -28,6 +30,12 @@ List<int> idsOfCentresWithUnverifiedEmails
 
         bool CentreEmailIsVerified(int userId, int centreIdIfLoggingIntoSingleCentre);
 
+        void UpdateLastAccessedForUsersTable(int Id);
+
+        void UpdateLastAccessedForDelegatesAccountsTable(int Id);
+
+        void UpdateLastAccessedForAdminAccountsTable(int Id);
+
         Task<string> HandleLoginResult(
             LoginResult loginResult,
             TicketReceivedContext context,
@@ -41,11 +49,28 @@ public class LoginService : ILoginService
     {
         private readonly IUserService userService;
         private readonly IUserVerificationService userVerificationService;
+        private readonly ILoginDataService loginDataService;
 
-        public LoginService(IUserService userService, IUserVerificationService userVerificationService)
+        public LoginService(IUserService userService, IUserVerificationService userVerificationService, ILoginDataService loginDataService)
         {
             this.userService = userService;
             this.userVerificationService = userVerificationService;
+            this.loginDataService = loginDataService;
+        }
+
+        public void UpdateLastAccessedForUsersTable(int Id)
+        {
+           loginDataService.UpdateLastAccessedForUsersTable(Id);
+        }
+
+        public void UpdateLastAccessedForDelegatesAccountsTable(int Id)
+        {
+            loginDataService.UpdateLastAccessedForDelegatesAccountsTable(Id);
+        }
+
+        public void UpdateLastAccessedForAdminAccountsTable(int Id)
+        {
+            loginDataService.UpdateLastAccessedForAdminAccountsTable(Id);
         }
 
         public LoginResult AttemptLogin(string username, string password)
diff --git a/DigitalLearningSolutions.Web/Startup.cs b/DigitalLearningSolutions.Web/Startup.cs
index bdc34b4d79..07b0c84237 100644
--- a/DigitalLearningSolutions.Web/Startup.cs
+++ b/DigitalLearningSolutions.Web/Startup.cs
@@ -534,6 +534,7 @@ private static void RegisterDataServices(IServiceCollection services)
             services.AddScoped<IRequestSupportTicketDataService, RequestSupportTicketDataService>();
             services.AddScoped<ICentreApplicationsDataService, CentreApplicationsDataService>();
             services.AddScoped<ICentreSelfAssessmentsDataService, CentreSelfAssessmentsDataService>();
+            services.AddScoped<ILoginDataService, LoginDataService>();
         }
 
         private static void RegisterHelpers(IServiceCollection services)
diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss
index 3f796924e8..47fb8f20d5 100644
--- a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss
+++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss
@@ -26,3 +26,31 @@
     }
   }
 }
+
+.nhsuk-expander[open] details.nhsuk-details[open] .nhsuk-details__summary-text::before {
+  display: block;
+  width: 0;
+  height: 0;
+  border-style: solid;
+  border-color: transparent;
+  clip-path: polygon(0% 0%, 50% 100%, 100% 0%);
+  border-width: 12.124px 7px 0 7px;
+  border-top-color: inherit;
+}
+
+.nhsuk-details[open] .nhsuk-details .nhsuk-details__summary-text::before {
+  bottom: 0;
+  content: "";
+  left: 0;
+  margin: auto;
+  position: absolute;
+  top: 0;
+  display: block;
+  width: 0;
+  height: 0;
+  border-style: solid;
+  border-color: transparent;
+  clip-path: polygon(0% 0%, 100% 50%, 0% 100%);
+  border-width: 7px 0 7px 12.124px;
+  border-left-color: inherit;
+}
diff --git a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/SearchableAdminAccountsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/SearchableAdminAccountsViewModel.cs
index 0afcfe7498..88f5ea2889 100644
--- a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/SearchableAdminAccountsViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/SearchableAdminAccountsViewModel.cs
@@ -5,7 +5,7 @@
     using DigitalLearningSolutions.Data.Models.User;
     using DigitalLearningSolutions.Web.Helpers;
     using DigitalLearningSolutions.Web.ViewModels.Common.SearchablePage;
-
+    using DateHelper = Helpers.DateHelper;
     public class SearchableAdminAccountsViewModel : BaseFilterableViewModel
     {
         public readonly bool CanShowDeleteAdminButton;
@@ -28,7 +28,10 @@ ReturnPageQuery returnPageQuery
             IsLocked = admin.UserAccount?.FailedLoginCount >= AuthHelper.FailedLoginThreshold;
             IsAdminActive = admin.AdminAccount.Active;
             IsUserActive = admin.UserAccount.Active;
-
+            if (admin.LastAccessed.HasValue)
+            {
+                LastAccessed = admin.LastAccessed.Value.ToString(DateHelper.StandardDateFormat);
+            }
             CanShowDeactivateAdminButton = IsAdminActive && admin.AdminIdReferenceCount > 0;
             CanShowDeleteAdminButton = admin.AdminIdReferenceCount == 0;
 
@@ -47,6 +50,7 @@ ReturnPageQuery returnPageQuery
         public bool IsLocked { get; set; }
         public bool IsAdminActive { get; set; }
         public bool IsUserActive { get; set; }
+        public string? LastAccessed { get; set; }
         public ReturnPageQuery ReturnPageQuery { get; set; }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Delegates/SearchableDelegatesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Delegates/SearchableDelegatesViewModel.cs
index 8ea0ed22e5..a615461e73 100644
--- a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Delegates/SearchableDelegatesViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Delegates/SearchableDelegatesViewModel.cs
@@ -28,6 +28,7 @@ ReturnPageQuery returnPageQuery
             LearningHubID = delegates.LearningHubAuthId;
             AccountClaimed = delegates.RegistrationConfirmationHash;
             DateRegistered = delegates.DateRegistered?.ToString(Data.Helpers.DateHelper.StandardDateFormat);
+            LastAccessed = delegates.LastAccessed?.ToString(Data.Helpers.DateHelper.StandardDateFormat);
             SelRegistered = delegates.SelfReg;
             IsDelegateActive = delegates.Active;
             IsCentreEmailVerified = delegates.CentreEmailVerified == null ? false : true;
@@ -52,6 +53,7 @@ ReturnPageQuery returnPageQuery
         public bool IsLocked { get; set; }
         public string AccountClaimed { get; set; }
         public string? DateRegistered { get; set; }
+        public string? LastAccessed { get; set; }
         public bool SelRegistered { get; set; }
         public bool IsDelegateActive { get; set; }
         public bool IsUserActive { get; set; }
diff --git a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Users/SearchableUserAccountViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Users/SearchableUserAccountViewModel.cs
index 5b1e7e63ac..263e008165 100644
--- a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Users/SearchableUserAccountViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Users/SearchableUserAccountViewModel.cs
@@ -27,6 +27,10 @@ ReturnPageQuery returnPageQuery
             ProfessionalRegistrationNumber = user.UserAccount.ProfessionalRegistrationNumber;
             LearningHubAuthId = user.UserAccount.LearningHubAuthId;
             ReturnPageQuery = returnPageQuery;
+            if (user.UserAccount.LastAccessed.HasValue)
+            {
+                LastAccessed = user.UserAccount.LastAccessed.Value.ToString(DateHelper.StandardDateFormat);
+            }
         }
 
         public int Id { get; set; }
@@ -51,6 +55,7 @@ ReturnPageQuery returnPageQuery
 
         public int? LearningHubAuthId { get; set; }
 
+        public string? LastAccessed { get; set; }
         public ReturnPageQuery ReturnPageQuery { get; set; }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs
index 7e4ab30b47..c3da68c395 100644
--- a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs
@@ -5,6 +5,8 @@
     using DigitalLearningSolutions.Data.Models.User;
     using DigitalLearningSolutions.Web.Helpers;
     using DigitalLearningSolutions.Web.ViewModels.Common.SearchablePage;
+    using System;
+    using DateHelper = Helpers.DateHelper;
 
     public class SearchableAdminViewModel : BaseFilterableViewModel
     {
@@ -23,6 +25,10 @@ ReturnPageQuery returnPageQuery
             EmailAddress = admin.EmailForCentreNotifications;
             IsLocked = admin.UserAccount.FailedLoginCount >= AuthHelper.FailedLoginThreshold;
             IsActive = admin.AdminAccount.Active;
+            if (admin.LastAccessed.HasValue)
+            {
+                LastAccessed = admin.LastAccessed.Value.ToString(DateHelper.StandardDateFormat);
+            }
             CanShowDeactivateAdminButton =
                 UserPermissionsHelper.LoggedInAdminCanDeactivateUser(admin.AdminAccount, loggedInAdminAccount);
 
@@ -46,6 +52,8 @@ ReturnPageQuery returnPageQuery
 
         public bool IsActive { get; set; }
 
+        public string? LastAccessed { get; set; }
+
         public ReturnPageQuery ReturnPageQuery { get; set; }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/Shared/DelegateInfoViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/Shared/DelegateInfoViewModel.cs
index 504fd4b454..814e488ac9 100644
--- a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/Shared/DelegateInfoViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/Shared/DelegateInfoViewModel.cs
@@ -41,6 +41,10 @@ IEnumerable<DelegateRegistrationPrompt> delegateRegistrationPrompts
             {
                 RegistrationDate = delegateUser.DateRegistered.Value.ToString(DateHelper.StandardDateFormat);
             }
+            if (delegateUser.LastAccessed.HasValue)
+            {
+                LastAccessed = delegateUser.LastAccessed.Value.ToString(DateHelper.StandardDateFormat);
+            }
 
             DelegateRegistrationPrompts = delegateRegistrationPrompts;
             RegistrationConfirmationHash = delegateUser.RegistrationConfirmationHash;
@@ -61,6 +65,7 @@ IEnumerable<DelegateRegistrationPrompt> delegateRegistrationPrompts
         public int JobGroupId { get; set; }
         public string? JobGroup { get; set; }
         public string? RegistrationDate { get; set; }
+        public string? LastAccessed { get; set; }
         public string ProfessionalRegistrationNumber { get; set; }
         public string? RegistrationConfirmationHash { get; set; }
 
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml
index 127cb973db..8bb58fd4d5 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml
@@ -3,91 +3,92 @@
 
 @model DashboardViewModel;
 @{
-  ViewData["Title"] = "Dashboard";
-  ViewData["Application"] = "Framework Service";
-  ViewData["HeaderPathName"] = "Framework Service";
+    ViewData["Title"] = "Dashboard";
+    ViewData["Application"] = "Framework Service";
+    ViewData["HeaderPathName"] = "Framework Service";
 }
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
 @section NavMenuItems {
-  <partial name="Shared/_NavMenuItems" />
+    <partial name="Shared/_NavMenuItems" />
 }
-  @section NavBreadcrumbs {
-  <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
-    <div class="nhsuk-width-container">
-      <ol class="nhsuk-breadcrumb__list">
-        <li class="nhsuk-breadcrumb__item">Frameworks</li>
-      </ol>
-    </div>
-  </nav>
-}
-  <h1>Frameworks Dashboard</h1>
-  <p class="nhsuk-body-m">Welcome <span class="nhsuk-u-font-weight-bold">@Model.Username</span>. You are accessing as a <span class="nhsuk-u-font-weight-bold">@(Model.IsFrameworkDeveloper ? "Framework Developer" : Model.IsFrameworkContributor ? "Framework Contributor" : "Framework Viewer")</span><feature name="@(FeatureFlags.WorkforceManagerInterface)"> and a <span class="nhsuk-u-font-weight-bold">@(Model.IsWorkforceManager ? "Workforce Manager" : Model.IsWorkforceContributor ? "Role Profile Contributor" : "Role Profile Viewer")</span></feature>.</p>
-  <ul class="nhsuk-grid-row nhsuk-card-group">
-    <feature name="@(FeatureFlags.WorkforceManagerInterface)">
-      <li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
-    </feature>
-    <feature name="@(FeatureFlags.WorkforceManagerInterface)" negate="true">
-      <li class="nhsuk-grid-column-full nhsuk-card-group__item">
-    </feature>
-    <div class="nhsuk-card">
-      <div class="nhsuk-card__content">
-        <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
-          @Model.DashboardData.FrameworksCount Frameworks
-        </p>
-        <ul class="nhsuk-contents-list__list">
-          @if (Model.IsFrameworkContributor | Model.IsFrameworkDeveloper)
-        {
-          <li class="nhsuk-contents-list__item"><a asp-controller="Frameworks" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewFrameworks" asp-route-tabname="Mine">Manage My Frameworks (@Model.DashboardData.MyFrameworksCount)</a></li>
-        }
-        <li class="nhsuk-contents-list__item"><a asp-controller="Frameworks" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewFrameworks" asp-route-tabname="All">View All Frameworks</a></li>
-      </ul>
-    </div>
-  </div>
-  </li>
-  <feature name="@(FeatureFlags.WorkforceManagerInterface)">
-    <li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
-      <div class="nhsuk-card">
-        <div class="nhsuk-card__content">
-          <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
-            @Model.DashboardData.RoleProfileCount Role Profiles
-          </p>
-          <ul class="nhsuk-contents-list__list">
-            @if (Model.IsWorkforceManager | Model.IsWorkforceContributor)
-            {
-              <li class="nhsuk-contents-list__item"><a asp-controller="RoleProfiles" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">Manage My Role Profiles (@Model.DashboardData.MyRoleProfileCount)</a></li>
-            }
-            <li class="nhsuk-contents-list__item"><a asp-controller="RoleProfiles" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfiles" asp-route-tabname="All">View All Role Profiles</a></li>
-          </ul>
+@section NavBreadcrumbs {
+    <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
+        <div class="nhsuk-width-container">
+            <ol class="nhsuk-breadcrumb__list">
+                <li class="nhsuk-breadcrumb__item">Frameworks</li>
+            </ol>
         </div>
-      </div>
-    </li>
-  </feature>
-</ul>
+    </nav>
+}
+<h1>Frameworks Dashboard</h1>
+<p class="nhsuk-body-m">Welcome <span class="nhsuk-u-font-weight-bold">@Model.Username</span>. You are accessing as a <span class="nhsuk-u-font-weight-bold">@(Model.IsFrameworkDeveloper ? "Framework Developer" : Model.IsFrameworkContributor ? "Framework Contributor" : "Framework Viewer")</span><feature name="@(FeatureFlags.WorkforceManagerInterface)"> and a <span class="nhsuk-u-font-weight-bold">@(Model.IsWorkforceManager ? "Workforce Manager" : Model.IsWorkforceContributor ? "Role Profile Contributor" : "Role Profile Viewer")</span></feature>.</p>
 <h2>Your to do list</h2>
 @if (Model.DashboardToDoItems.Count() > 0)
 {
-  <ul class="nhsuk-contents-list__list">
-    @foreach (var toDoItem in Model.DashboardToDoItems)
-    {
-      <li class="nhsuk-contents-list__item">
-        @if (toDoItem.FrameworkID != null)
-        {
-          <a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-controller="Frameworks" asp-route-tabname="Structure" asp-route-frameworkId="@toDoItem.FrameworkID" asp-action="ViewFramework">
-            @(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString())
-          </a>
-        }
-        else
+    <ul class="nhsuk-contents-list__list">
+        @foreach (var toDoItem in Model.DashboardToDoItems)
         {
-          <a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-controller="RoleProfiles" asp-route-roleProfileId="@toDoItem.RoleProfileID" asp-action="ViewRoleProfile">
-            @(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString())
-          </a>
-        }
+            <li class="nhsuk-contents-list__item">
+                @if (toDoItem.FrameworkID != null)
+                {
+                    <a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-controller="Frameworks" asp-route-tabname="Structure" asp-route-frameworkId="@toDoItem.FrameworkID" asp-action="ViewFramework">
+                        @(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString())
+                    </a>
+                }
+                else
+                {
+                    <a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-controller="RoleProfiles" asp-route-roleProfileId="@toDoItem.RoleProfileID" asp-action="ViewRoleProfile">
+                        @(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString())
+                    </a>
+                }
 
-      </li>
-    }
-  </ul>
+            </li>
+        }
+    </ul>
 }
 else
 {
-  <p>There are no tasks requiring your attention.</p>
+    <p>There are no tasks requiring your attention.</p>
 }
+
+<ul class="nhsuk-grid-row nhsuk-card-group">
+    <feature name="@(FeatureFlags.WorkforceManagerInterface)">
+        <li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
+    </feature>
+    <feature name="@(FeatureFlags.WorkforceManagerInterface)" negate="true">
+        <li class="nhsuk-grid-column-full nhsuk-card-group__item">
+    </feature>
+    <div class="nhsuk-card">
+        <div class="nhsuk-card__content">
+            <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
+                @Model.DashboardData.FrameworksCount Frameworks
+            </p>
+            <ul class="nhsuk-contents-list__list">
+                @if (Model.IsFrameworkContributor | Model.IsFrameworkDeveloper)
+                {
+                    <li class="nhsuk-contents-list__item"><a asp-controller="Frameworks" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewFrameworks" asp-route-tabname="Mine">Manage My Frameworks (@Model.DashboardData.MyFrameworksCount)</a></li>
+                }
+                <li class="nhsuk-contents-list__item"><a asp-controller="Frameworks" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewFrameworks" asp-route-tabname="All">View All Frameworks</a></li>
+            </ul>
+        </div>
+    </div>
+    </li>
+    <feature name="@(FeatureFlags.WorkforceManagerInterface)">
+        <li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
+            <div class="nhsuk-card">
+                <div class="nhsuk-card__content">
+                    <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
+                        @Model.DashboardData.RoleProfileCount Role Profiles
+                    </p>
+                    <ul class="nhsuk-contents-list__list">
+                        @if (Model.IsWorkforceManager | Model.IsWorkforceContributor)
+                        {
+                            <li class="nhsuk-contents-list__item"><a asp-controller="RoleProfiles" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">Manage My Role Profiles (@Model.DashboardData.MyRoleProfileCount)</a></li>
+                        }
+                        <li class="nhsuk-contents-list__item"><a asp-controller="RoleProfiles" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfiles" asp-route-tabname="All">View All Role Profiles</a></li>
+                    </ul>
+                </div>
+            </div>
+        </li>
+    </feature>
+</ul>
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml
index 346322f8e3..bad5f5af78 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml
@@ -29,23 +29,6 @@
 {
     <partial name="_NonReportableSelfAssessment" />
 }
-@if (Model.IsSupervised)
-{
-    <div class="nhsuk-grid-row">
-        <div class="nhsuk-grid-column-two-thirds">
-            @(Html.Raw(Model.Description))
-        </div>
-        <div class="nhsuk-grid-column-one-third">
-            <partial name="Shared/_SupervisorsCard"
-                     model="@Model.Supervisors" />
-        </div>
-    </div>
-}
-else
-{
-    <div class="nhsuk-u-reading-width">@(Html.Raw(Model.Description))</div>
-}
-
 @if (Model.LinearNavigation)
 {
     <a role="button" class="nhsuk-button @(Model.UserBookmark != null || bookmarkIsRelevant ? "nhsuk-button--secondary" : "") trigger-loader" asp-action="AddOptionalCompetencies" asp-route-selfAssessmentId="@Model.Id" asp-route-vocabulary="@Model.VocabPlural">View @Model.VocabPlural</a>
@@ -72,6 +55,19 @@ else
         <a role="button" class="nhsuk-button nhsuk-button--secondary trigger-loader" href="@Configuration["AppRootPath"]@Model.UserBookmark">Continue where I left off</a>
     }
 }
-
-
-
+@if (Model.IsSupervised)
+{
+    <div class="nhsuk-grid-row">
+        <div class="nhsuk-grid-column-two-thirds">
+            @(Html.Raw(Model.Description))
+        </div>
+        <div class="nhsuk-grid-column-one-third">
+            <partial name="Shared/_SupervisorsCard"
+                     model="@Model.Supervisors" />
+        </div>
+    </div>
+}
+else
+{
+    <div class="nhsuk-u-reading-width">@(Html.Raw(Model.Description))</div>
+}
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewTable.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewTable.cshtml
index 7c51b25169..be40c4aa32 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewTable.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewTable.cshtml
@@ -49,7 +49,7 @@
                                      model="competency.CompetencyFlags" />
                         </div>
                         <div class="nhsuk-grid-column-full">
-                            @if (competency.Description != null && !competency.AlwaysShowDescription)
+                            @if (!string.IsNullOrWhiteSpace(competency.Description) && !competency.AlwaysShowDescription)
                             {
                                 <details class="nhsuk-details">
                                     <summary class="nhsuk-details__summary nhsuk-u-padding-0">
@@ -64,10 +64,10 @@
                             }
                             else
                             {
-                                <p class="@(competency.Description != null ? "nhsuk-u-font-weight-bold" : "") nhsuk-u-margin-bottom-0">
+                                <p class="@(!string.IsNullOrWhiteSpace(competency.Description) ? "nhsuk-u-font-weight-bold" : "") nhsuk-u-margin-bottom-0">
                                     @competency.Name
                                 </p>
-                                @if (competency.Description != null)
+                                @if (!string.IsNullOrWhiteSpace(competency.Description))
                                 {
                                     <p class="nhsuk-u-margin-top-2">
                                         @(Html.Raw(competency.Description))
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/_SearchableAdminAccountsCard.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/_SearchableAdminAccountsCard.cshtml
index be0fc62d7f..50946491a4 100644
--- a/DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/_SearchableAdminAccountsCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/_SearchableAdminAccountsCard.cshtml
@@ -74,6 +74,14 @@
                     <dd class="nhsuk-summary-list__actions">
                     </dd>
                 </div>
+                <div class="nhsuk-summary-list__row">
+                    <dt class="nhsuk-summary-list__key">
+                        Last Accessed
+                    </dt>
+                    <partial name="_SummaryFieldValue" model="@Model.LastAccessed" />
+                    <dd class="nhsuk-summary-list__actions">
+                    </dd>
+                </div>
                 <div class="nhsuk-summary-list__row details-list-with-button__row">
                     <dt class="nhsuk-summary-list__key">
                         User Account
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/_SearchableDelegatesCard.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/_SearchableDelegatesCard.cshtml
index be45052cc3..21e74a2e1a 100644
--- a/DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/_SearchableDelegatesCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/_SearchableDelegatesCard.cshtml
@@ -162,6 +162,14 @@
                     <dd class="nhsuk-summary-list__actions">
                     </dd>
                 </div>
+                <div class="nhsuk-summary-list__row details-list-with-button__row">
+                    <dt class="nhsuk-summary-list__key">
+                        Last Accessed
+                    </dt>
+                    <partial name="_SummaryFieldValue" model="@Model.LastAccessed" />
+                    <dd class="nhsuk-summary-list__actions">
+                    </dd>
+                </div>
                 <div class="nhsuk-summary-list__row details-list-with-button__row">
                     <dt class="nhsuk-summary-list__key">
                         Self registered
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/_SearchableUserCard.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/_SearchableUserCard.cshtml
index 959e8c2060..521b421106 100644
--- a/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/_SearchableUserCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/_SearchableUserCard.cshtml
@@ -86,6 +86,12 @@
                         </div>
                     </dd>
                 </div>
+                <div class="nhsuk-summary-list__row details-list-with-button__row">
+                    <dt class="nhsuk-summary-list__key">
+                        Last Accessed
+                    </dt>
+                    <partial name="_SummaryFieldValue" model="@Model.LastAccessed" />
+                </div>
                 <div class="nhsuk-summary-list__row details-list-with-button__row">
                     <dt class="nhsuk-summary-list__key">
                         Job Group
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml
index db4fcd24c2..07b71ef446 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml
@@ -3,99 +3,99 @@
 
 @model SupervisorDashboardViewModel;
 @{
-  ViewData["Title"] = "Dashboard";
-  ViewData["Application"] = "Supervisor";
-  ViewData["HeaderPathName"] = "Supervisor";
+    ViewData["Title"] = "Dashboard";
+    ViewData["Application"] = "Supervisor";
+    ViewData["HeaderPathName"] = "Supervisor";
 }
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
 @section NavMenuItems {
-  <partial name="Shared/_NavMenuItems" />
+    <partial name="Shared/_NavMenuItems" />
 }
-  @section NavBreadcrumbs {
-  <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
-    <div class="nhsuk-width-container">
-      <ol class="nhsuk-breadcrumb__list">
-        <li class="nhsuk-breadcrumb__item">Supervisor</li>
-      </ol>
-    </div>
-  </nav>
+@section NavBreadcrumbs {
+    <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
+        <div class="nhsuk-width-container">
+            <ol class="nhsuk-breadcrumb__list">
+                <li class="nhsuk-breadcrumb__item">Supervisor</li>
+            </ol>
+        </div>
+    </nav>
 }
-  <h1>Supervisor Dashboard</h1>
-  @if (Model.BannerText != null)
+<h1>Supervisor Dashboard</h1>
+<h2>Your to do list</h2>
+@if (Model.SupervisorDashboardToDoItems.Count() > 0)
 {
-  <h2 class="page-subheading word-break">@Model.BannerText</h2>
-}
-<ul class="nhsuk-grid-row nhsuk-card-group">
-
-  <feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)">
-    <li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
-  </feature>
-  <feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)" negate="true">
-    <li class="nhsuk-grid-column-full nhsuk-card-group__item">
-  </feature>
-  <div class="nhsuk-card">
-    <div class="nhsuk-card__content">
-      <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
-        @Model.DashboardData.StaffCount Staff  @if (Model.DashboardData.StaffUnregisteredCount > 0)
+    <ul class="nhsuk-contents-list__list">
+        @foreach (var toDoItem in Model.SupervisorDashboardToDoItems)
         {
-          <span class="nhsuk-u-secondary-text-color nhsuk-u-font-weight-normal">
-            (@Model.DashboardData.StaffUnregisteredCount not registered)
-          </span>
-        }
-      </p>
-      <ul class="nhsuk-contents-list__list">
 
-        <li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="MyStaffList">View My Staff List</a></li>
-      </ul>
-    </div>
-  </div>
-  </li>
-  <feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)">
-    <li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
-      <div class="nhsuk-card">
-        <div class="nhsuk-card__content">
-          <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
-            @Model.DashboardData.ProfileCount Role Profiles
-          </p>
-          <ul class="nhsuk-contents-list__list">
-            @if (Model.DashboardData.AwaitingReviewCount > 0)
+            if (toDoItem.SignOffRequest)
             {
-              <li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="RoleProfileReviewRequests" asp-route-tabname="Mine">Profile Assessment Sign-off Requests (@Model.DashboardData.AwaitingReviewCount)</a></li>
+                <li class="nhsuk-contents-list__item">
+                    <a class="nhsuk-link--no-visited-state" asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@toDoItem.SupervisorDelegateId" asp-route-candidateAssessmentId="@toDoItem.ID">
+                        Review and sign-off @toDoItem.DelegateName's @toDoItem.ProfileName
+                    </a>. Requested @toDoItem.Requested.ToShortDateString()
+                </li>
             }
-            <li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfileAssessments" asp-route-tabname="All">View Profile Assessments (@Model.DashboardData.ProfileSelfAssessmentCount)</a></li>
-          </ul>
-        </div>
-      </div>
-    </li>
-  </feature>
-</ul>
-<h2>Your to do list</h2>
-@if (Model.SupervisorDashboardToDoItems.Count() > 0)
-{
-  <ul class="nhsuk-contents-list__list">
-    @foreach (var toDoItem in Model.SupervisorDashboardToDoItems)
-    {
-
-      if (toDoItem.SignOffRequest)
-      {
-        <li class="nhsuk-contents-list__item">
-          <a class="nhsuk-link--no-visited-state" asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@toDoItem.SupervisorDelegateId" asp-route-candidateAssessmentId="@toDoItem.ID">
-            Review and sign-off @toDoItem.DelegateName's @toDoItem.ProfileName
-          </a>. Requested @toDoItem.Requested.ToShortDateString()
-        </li>
-      }
-      else if (toDoItem.ResultsReviewRequest)
-      {
-        <li class="nhsuk-contents-list__item">
-          <a class="nhsuk-link--no-visited-state" asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@toDoItem.SupervisorDelegateId" asp-route-candidateAssessmentId="@toDoItem.ID">
-            Confirm self-assessment results for @toDoItem.DelegateName's @toDoItem.ProfileName
-          </a>. Requested @toDoItem.Requested.ToShortDateString()
-        </li>
-      }
-    }
-  </ul>
+            else if (toDoItem.ResultsReviewRequest)
+            {
+                <li class="nhsuk-contents-list__item">
+                    <a class="nhsuk-link--no-visited-state" asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@toDoItem.SupervisorDelegateId" asp-route-candidateAssessmentId="@toDoItem.ID">
+                        Confirm self-assessment results for @toDoItem.DelegateName's @toDoItem.ProfileName
+                    </a>. Requested @toDoItem.Requested.ToShortDateString()
+                </li>
+            }
+        }
+    </ul>
 }
 else
 {
-  <p>There are no tasks requiring your attention.</p>
+    <p>There are no tasks requiring your attention.</p>
+}
+@if (Model.BannerText != null)
+{
+    <h2 class="page-subheading word-break">@Model.BannerText</h2>
 }
+<ul class="nhsuk-grid-row nhsuk-card-group">
+
+    <feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)">
+        <li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
+    </feature>
+    <feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)" negate="true">
+        <li class="nhsuk-grid-column-full nhsuk-card-group__item">
+    </feature>
+    <div class="nhsuk-card">
+        <div class="nhsuk-card__content">
+            <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
+                @Model.DashboardData.StaffCount Staff  @if (Model.DashboardData.StaffUnregisteredCount > 0)
+                {
+                    <span class="nhsuk-u-secondary-text-color nhsuk-u-font-weight-normal">
+                        (@Model.DashboardData.StaffUnregisteredCount not registered)
+                    </span>
+                }
+            </p>
+            <ul class="nhsuk-contents-list__list">
+
+                <li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="MyStaffList">View My Staff List</a></li>
+            </ul>
+        </div>
+    </div>
+    </li>
+    <feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)">
+        <li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
+            <div class="nhsuk-card">
+                <div class="nhsuk-card__content">
+                    <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
+                        @Model.DashboardData.ProfileCount Role Profiles
+                    </p>
+                    <ul class="nhsuk-contents-list__list">
+                        @if (Model.DashboardData.AwaitingReviewCount > 0)
+                        {
+                            <li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="RoleProfileReviewRequests" asp-route-tabname="Mine">Profile Assessment Sign-off Requests (@Model.DashboardData.AwaitingReviewCount)</a></li>
+                        }
+                        <li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfileAssessments" asp-route-tabname="All">View Profile Assessments (@Model.DashboardData.ProfileSelfAssessmentCount)</a></li>
+                    </ul>
+                </div>
+            </div>
+        </li>
+    </feature>
+</ul>
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_DelegateProfileAssessmentGrid.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_DelegateProfileAssessmentGrid.cshtml
index 7e5b1e87e9..d638ca4ac8 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_DelegateProfileAssessmentGrid.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_DelegateProfileAssessmentGrid.cshtml
@@ -12,7 +12,7 @@
                 Self Assessment
             </th>
             <th role="columnheader" class="" scope="col">
-                Role links
+                Role
             </th>
             <th role="columnheader" class="" scope="col">
                 Last activity
@@ -36,9 +36,7 @@
                     <span class="nhsuk-table-responsive__heading">Self Assessment </span>@delegateSelfAssessment.RoleName
                 </td>
                 <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-                    <span class="nhsuk-table-responsive__heading">Role links </span>@(delegateSelfAssessment.ProfessionalGroup != null ? delegateSelfAssessment.ProfessionalGroup : "None/Generic")
-                    @(delegateSelfAssessment.SubGroup != null ? " / " + delegateSelfAssessment.SubGroup : "")
-                    @(delegateSelfAssessment.RoleProfile != null ? " / " + delegateSelfAssessment.RoleProfile : "")
+                    <span class="nhsuk-table-responsive__heading">Role</span>@(delegateSelfAssessment.SupervisorRoleTitle)
                 </td>
                 <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
                     <span class="nhsuk-table-responsive__heading">Last activity </span>@delegateSelfAssessment.LastAccessed.ToShortDateString()<br /> (@delegateSelfAssessment.LaunchCount launches)
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml
index 97dc08a7fa..6b4acba585 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml
@@ -130,9 +130,25 @@
                                     <span class="nhsuk-table-responsive__heading">@competency.Vocabulary </span>
                                     <div class="nhsuk-checkboxes__item">
                                         <input data-group="@competencyGroup.Key" class="nhsuk-checkboxes__input select-all-checkbox" id="result-check-@question.SelfAssessmentResultSupervisorVerificationId" name="resultChecked" type="checkbox" value="@question.SelfAssessmentResultSupervisorVerificationId">
-                                        <label class="nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-16" for="result-check-@question.SelfAssessmentResultSupervisorVerificationId">
-                                            @competency.Name
+                                        <label aria-label="Competency.Name" class="@(string.IsNullOrEmpty(competency.Description) ? "nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-16" : "nhsuk-label nhsuk-checkboxes__label nhsuk-u-padding-0 nhsuk-u-display-block")" for="result-check-@question.SelfAssessmentResultSupervisorVerificationId">
+                                            @if (competency.Description == null)
+                                            {
+                                                @competency.Name
+                                            }
                                         </label>
+                                        @if (!string.IsNullOrEmpty(competency.Description))
+                                        {
+                                            <details class="nhsuk-details nhsuk-u-padding-left-2 ">
+                                                <summary class="nhsuk-details__summary nhsuk-u-padding-left-2">
+                                                    <span class="nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-16 " for="result-check-@question.SelfAssessmentResultSupervisorVerificationId">
+                                                        @competency.Name
+                                                    </span>
+                                                </summary>
+                                                <div class="nhsuk-details__text nhsuk-u-margin-left-6 nhsuk-u-margin-top-2">
+                                                    @(Html.Raw(@competency.Description))
+                                                </div>
+                                            </details>
+                                        }
                                     </div>
                                 </td>
                                 <partial name="Shared/_AssessmentQuestionCells" model="question" />
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/_SearchableAdminCard.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/_SearchableAdminCard.cshtml
index 420378260a..fe44f17379 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/_SearchableAdminCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/_SearchableAdminCard.cshtml
@@ -35,6 +35,14 @@
                         @Model.CategoryName
                     </dd>
                 </div>
+                <div class="nhsuk-summary-list__row">
+                    <dt class="nhsuk-summary-list__key">
+                        Last accessed
+                    </dt>
+                    <dd class="nhsuk-summary-list__value">
+                        @(Model.LastAccessed != null ? Model.LastAccessed : "-")
+                    </dd>
+                </div>
             </dl>
 
             @if (Model.IsLocked)
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/AllDelegates/_SearchableDelegateCard.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/AllDelegates/_SearchableDelegateCard.cshtml
index 13f17d0ae7..4064cd80bd 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/AllDelegates/_SearchableDelegateCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/AllDelegates/_SearchableDelegateCard.cshtml
@@ -4,91 +4,98 @@
 
 <div class="searchable-element nhsuk-expander-group word-break" id="@Model.DelegateInfo.Id-card">
 
-  <details class="nhsuk-details nhsuk-expander">
-    <summary class="nhsuk-details__summary">
-      <span class="nhsuk-details__summary-text" id="@Model.DelegateInfo.Id-name">
-        <span class="searchable-element-title" name="name">@Model.DelegateInfo.TitleName</span>
-        @if (Model.DelegateInfo.Email == null)
-          @("(Email address not set)")
-        else
-          @DisplayStringHelper.GetEmailDisplayString(Model.DelegateInfo.Email)
+    <details class="nhsuk-details nhsuk-expander">
+        <summary class="nhsuk-details__summary">
+            <span class="nhsuk-details__summary-text" id="@Model.DelegateInfo.Id-name">
+                <span class="searchable-element-title" name="name">@Model.DelegateInfo.TitleName</span>
+                @if (Model.DelegateInfo.Email == null)
+                    @("(Email address not set)")
+                else
+                    @DisplayStringHelper.GetEmailDisplayString(Model.DelegateInfo.Email)
 
-        </span>
-      </summary>
+            </span>
+        </summary>
 
-      <div class="nhsuk-details__text">
+        <div class="nhsuk-details__text">
 
-        <partial name="SearchablePage/_FilterableTags" model="@Model.Tags" />
+            <partial name="SearchablePage/_FilterableTags" model="@Model.Tags" />
 
-        <dl class="nhsuk-summary-list details-list-with-button">
-          <div class="nhsuk-summary-list__row details-list-with-button__row">
-            <dt class="nhsuk-summary-list__key">
-              Name
-            </dt>
-            <partial name="_SummaryFieldValue" model="@Model.DelegateInfo.Name" />
-          </div>
+            <dl class="nhsuk-summary-list details-list-with-button">
+                <div class="nhsuk-summary-list__row details-list-with-button__row">
+                    <dt class="nhsuk-summary-list__key">
+                        Name
+                    </dt>
+                    <partial name="_SummaryFieldValue" model="@Model.DelegateInfo.Name" />
+                </div>
 
-          <div class="nhsuk-summary-list__row details-list-with-button__row">
-            <dt class="nhsuk-summary-list__key ">
-              Email
-            </dt>
-            <partial name="_SearchableSummaryFieldValue" model=@(Model.DelegateInfo.Email, "email") />
-          </div>
+                <div class="nhsuk-summary-list__row details-list-with-button__row">
+                    <dt class="nhsuk-summary-list__key ">
+                        Email
+                    </dt>
+                    <partial name="_SearchableSummaryFieldValue" model=@(Model.DelegateInfo.Email, "email") />
+                </div>
 
-          <div class="nhsuk-summary-list__row details-list-with-button__row">
-            <dt class="nhsuk-summary-list__key">
-              ID
-            </dt>
-            <partial name="_SearchableSummaryFieldValue" model=@(Model.DelegateInfo.CandidateNumber, "candidate-number") />
-          </div>
+                <div class="nhsuk-summary-list__row details-list-with-button__row">
+                    <dt class="nhsuk-summary-list__key">
+                        ID
+                    </dt>
+                    <partial name="_SearchableSummaryFieldValue" model=@(Model.DelegateInfo.CandidateNumber, "candidate-number") />
+                </div>
 
-          <div class="nhsuk-summary-list__row details-list-with-button__row">
-            <dt class="nhsuk-summary-list__key">
-              Registration date
-            </dt>
-            <partial name="_SummaryFieldValue" model="@Model.DelegateInfo.RegistrationDate" />
-            <div hidden name="registration-date">@Model.DelegateInfo.RegistrationDate</div>
-          </div>
+                <div class="nhsuk-summary-list__row details-list-with-button__row">
+                    <dt class="nhsuk-summary-list__key">
+                        Registration date
+                    </dt>
+                    <partial name="_SummaryFieldValue" model="@Model.DelegateInfo.RegistrationDate" />
+                    <div hidden name="registration-date">@Model.DelegateInfo.RegistrationDate</div>
+                </div>
 
-          <div class="nhsuk-summary-list__row details-list-with-button__row">
-            <dt class="nhsuk-summary-list__key">
-              Job group
-            </dt>
-            <partial name="_SummaryFieldValue" model="@Model.DelegateInfo.JobGroup" />
-            <div hidden data-filter-value="@Model.JobGroupFilter"></div>
-          </div>
+                <div class="nhsuk-summary-list__row details-list-with-button__row">
+                    <dt class="nhsuk-summary-list__key">
+                        Last Accessed date
+                    </dt>
+                    <partial name="_SummaryFieldValue" model="@Model.DelegateInfo.LastAccessed" />
+                </div>
 
-          <div class="nhsuk-summary-list__row details-list-with-button__row">
-            <dt class="nhsuk-summary-list__key">
-              Professional Registration Number
-            </dt>
-            <partial name="_SummaryFieldValue" model="@Model.DelegateInfo.ProfessionalRegistrationNumber" />
-          </div>
+                <div class="nhsuk-summary-list__row details-list-with-button__row">
+                    <dt class="nhsuk-summary-list__key">
+                        Job group
+                    </dt>
+                    <partial name="_SummaryFieldValue" model="@Model.DelegateInfo.JobGroup" />
+                    <div hidden data-filter-value="@Model.JobGroupFilter"></div>
+                </div>
 
-          @foreach (var delegateRegistrationPrompt in Model.DelegateInfo.DelegateRegistrationPrompts)
-        {
-          <div class="nhsuk-summary-list__row details-list-with-button__row">
-            <dt class="nhsuk-summary-list__key">@delegateRegistrationPrompt.Prompt</dt>
-            <partial name="_SummaryFieldValue" model="@delegateRegistrationPrompt.Answer" />
-            @if (Model.RegistrationPromptFilters.ContainsKey(delegateRegistrationPrompt.PromptNumber))
-            {
-              <div hidden data-filter-value="@Model.RegistrationPromptFilters[delegateRegistrationPrompt.PromptNumber]"></div>
-            }
-          </div>
-        }
-      </dl>
+                <div class="nhsuk-summary-list__row details-list-with-button__row">
+                    <dt class="nhsuk-summary-list__key">
+                        Professional Registration Number
+                    </dt>
+                    <partial name="_SummaryFieldValue" model="@Model.DelegateInfo.ProfessionalRegistrationNumber" />
+                </div>
 
-      <a class="nhsuk-button" asp-controller="ViewDelegate" asp-action="Index" asp-route-delegateId="@Model.DelegateInfo.Id" role="button">Manage delegate</a>
-      <a class="nhsuk-button nhsuk-button--secondary"
-         role="button"
-         data-return-page-enabled="true"
-         asp-controller="SetDelegatePassword"
-         asp-action="Index"
-         asp-route-delegateId="@Model.DelegateInfo.Id"
-         asp-route-isFromViewDelegatePage="false"
-         asp-route-returnPageQuery="@Model.ReturnPageQuery?.ToString()">
-        Set password
-      </a>
-    </div>
-  </details>
+                @foreach (var delegateRegistrationPrompt in Model.DelegateInfo.DelegateRegistrationPrompts)
+                {
+                    <div class="nhsuk-summary-list__row details-list-with-button__row">
+                        <dt class="nhsuk-summary-list__key">@delegateRegistrationPrompt.Prompt</dt>
+                        <partial name="_SummaryFieldValue" model="@delegateRegistrationPrompt.Answer" />
+                        @if (Model.RegistrationPromptFilters.ContainsKey(delegateRegistrationPrompt.PromptNumber))
+                        {
+                            <div hidden data-filter-value="@Model.RegistrationPromptFilters[delegateRegistrationPrompt.PromptNumber]"></div>
+                        }
+                    </div>
+                }
+            </dl>
+
+            <a class="nhsuk-button" asp-controller="ViewDelegate" asp-action="Index" asp-route-delegateId="@Model.DelegateInfo.Id" role="button">Manage delegate</a>
+            <a class="nhsuk-button nhsuk-button--secondary"
+               role="button"
+               data-return-page-enabled="true"
+               asp-controller="SetDelegatePassword"
+               asp-action="Index"
+               asp-route-delegateId="@Model.DelegateInfo.Id"
+               asp-route-isFromViewDelegatePage="false"
+               asp-route-returnPageQuery="@Model.ReturnPageQuery?.ToString()">
+                Set password
+            </a>
+        </div>
+    </details>
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateSelfAssessmentDetails.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateSelfAssessmentDetails.cshtml
index b05ac0e229..a5376e461d 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateSelfAssessmentDetails.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateSelfAssessmentDetails.cshtml
@@ -45,14 +45,28 @@
             <dd class="nhsuk-summary-list__value" data-name-for-sorting="complete-by-date">
                 @if (Model.Supervisors.Any())
                 {
-                    @foreach (var supervisor in Model.Supervisors.Take(3))
-                    {
-                        <p>@supervisor.SupervisorName, @supervisor.RoleName (@supervisor.CentreName)</p>
-                    }
-                    @if (Model.Supervisors.Count() > 3)
-                    {
-                        <p>+@(Model.Supervisors.Count() - 3) more</p>
-                    }
+                    <details class="nhsuk-details">
+                        <summary class="nhsuk-details__summary nhsuk-u-padding-0">
+                            @{
+                                var supervisors = string.Join(", ", new[] {
+                                    new { Role = "Educator/Manager", Count = Model.Supervisors.Count(x => x.RoleName == "Educator/Manager") },
+                                    new { Role = "Assessor", Count = Model.Supervisors.Count(x => x.RoleName == "Assessor") },
+                                    new { Role = "Supervisor", Count = Model.Supervisors.Count(x => x.RoleName == "Supervisor") }
+                                    }
+                                .Where(x => x.Count > 0)
+                                .Select(x => $"{x.Count} {x.Role}{(x.Count > 1 ? "s" : "")}"));
+                            }
+                            <span class="nhsuk-details__summary-text nhsuk-u-padding-left-4">@supervisors</span>
+                        </summary>
+                        <div class="nhsuk-details__text nhsuk-u-margin-top-2">
+                            <ul>
+                                @foreach (var supervisor in Model.Supervisors)
+                                {
+                                    <li>@supervisor.SupervisorName, @supervisor.RoleName (@supervisor.CentreName)</li>
+                                }
+                            </ul>
+                        </div>
+                    </details>
                 }
                 else
                 {