diff --git a/backend/webapi.tests/Features/Parties/Demographics.cs b/backend/webapi.tests/Features/Parties/Demographics.cs
index 364d65d5c..1c055f67d 100644
--- a/backend/webapi.tests/Features/Parties/Demographics.cs
+++ b/backend/webapi.tests/Features/Parties/Demographics.cs
@@ -9,7 +9,7 @@ namespace PidpTests.Features.Parties;
 public class DemographicsTests : InMemoryDbTest
 {
     [Fact]
-    public async void UpdatePartyDemographics_NewParty_PropertiesUpdatedNoDomainEvent()
+    public async Task UpdatePartyDemographics_NewParty_PropertiesUpdatedDomainEvent()
     {
         var party = this.TestDb.HasAParty(party =>
         {
@@ -19,7 +19,7 @@ public async void UpdatePartyDemographics_NewParty_PropertiesUpdatedNoDomainEven
         var command = new Command
         {
             Id = party.Id,
-            Email = "pidp.test@goh.com",
+            Email = "pidp.test@email.com",
             Phone = "5555555555",
             PreferredFirstName = "PFirst",
             PreferredMiddleName = "PMid",
@@ -36,11 +36,14 @@ public async void UpdatePartyDemographics_NewParty_PropertiesUpdatedNoDomainEven
         Assert.Equal(command.PreferredMiddleName, updatedParty.PreferredMiddleName);
         Assert.Equal(command.PreferredLastName, updatedParty.PreferredLastName);
 
-        Assert.Empty(this.PublishedEvents.OfType<PartyEmailUpdated>());
+        Assert.Single(this.PublishedEvents.OfType<PartyEmailUpdated>());
+        var emailEvent = this.PublishedEvents.OfType<PartyEmailUpdated>().Single();
+        Assert.Equal(party.Id, emailEvent.PartyId);
+        Assert.Equal(command.Email, emailEvent.NewEmail);
     }
 
     [Fact]
-    public async void UpdatePartyDemographics_ExistingParty_PropertiesUpdatedDomainEvent()
+    public async Task UpdatePartyDemographics_ExistingParty_PropertiesUpdatedDomainEvent()
     {
         var party = this.TestDb.HasAParty(party =>
         {
@@ -79,7 +82,7 @@ public async void UpdatePartyDemographics_ExistingParty_PropertiesUpdatedDomainE
     }
 
     [Fact]
-    public async void UpdatePartyDemographics_ExistingParty_TrimPreferredNames()
+    public async Task UpdatePartyDemographics_ExistingParty_TrimPreferredNames()
     {
         var party = this.TestDb.HasAParty(party =>
         {
@@ -114,7 +117,7 @@ public async void UpdatePartyDemographics_ExistingParty_TrimPreferredNames()
     }
 
     [Fact]
-    public async void UpdatePartyDemographics_ExistingPartySameEmail_NoDomainEvent()
+    public async Task UpdatePartyDemographics_ExistingPartySameEmail_NoDomainEvent()
     {
         var party = this.TestDb.HasAParty(party => party.Email = "existing@email.com");
         var command = new Command
diff --git a/backend/webapi.tests/Features/ThirdPartyIntegrations/EndorsementData.cs b/backend/webapi.tests/Features/ThirdPartyIntegrations/EndorsementData.cs
index b8b5858fe..b08ec8822 100644
--- a/backend/webapi.tests/Features/ThirdPartyIntegrations/EndorsementData.cs
+++ b/backend/webapi.tests/Features/ThirdPartyIntegrations/EndorsementData.cs
@@ -17,9 +17,9 @@ public class EndorsementDataTests : InMemoryDbTest
         && record.StatusReasonCode == result.StatusReasonCode;
 
     [Fact]
-    public async void GetEndorsementData_NoParty_404()
+    public async Task GetEndorsementData_NoParty_404()
     {
-        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid"));
+        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid@bcsc"));
         var query = new EndorsementData.Query { Hpdid = "NoMatch" };
         var handler = this.MockDependenciesFor<EndorsementData.QueryHandler>();
 
@@ -29,33 +29,24 @@ public async void GetEndorsementData_NoParty_404()
     }
 
     [Fact]
-    public async void GetEndorsementData_NoEndorsements_Empty()
+    public async Task GetEndorsementData_NoEndorsements_Empty()
     {
-        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid"));
+        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid@bcsc"));
         var query = new EndorsementData.Query { Hpdid = "hpdid" };
         var handler = this.MockDependenciesFor<EndorsementData.QueryHandler>();
 
         var result = await handler.HandleAsync(query);
 
         Assert.True(result.IsSuccess);
-        Assert.Equal(new List<EndorsementData.Model>(), result.Value);
+        Assert.Equal([], result.Value);
     }
 
     [Fact]
-    public async void GetEndorsementData_OneEndorsementNotActive_Empty()
+    public async Task GetEndorsementData_OneEndorsementNotActive_Empty()
     {
-        var expectedHpdid = "expected";
-        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid"));
-        this.TestDb.Has(APartyWith(id: 2, hpdid: expectedHpdid));
-        this.TestDb.Has(new Endorsement
-        {
-            Active = false,
-            EndorsementRelationships = new[]
-            {
-                new EndorsementRelationship { PartyId = 1 },
-                new EndorsementRelationship { PartyId = 2 }
-            }
-        });
+        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid@bcsc"));
+        this.TestDb.Has(APartyWith(id: 2, hpdid: "anotherHpdid@bcsc"));
+        this.TestDb.Has(AnEndorsementBetween(1, 2, isActive: false));
         var query = new EndorsementData.Query { Hpdid = "hpdid" };
         var handler = this.MockDependenciesFor<EndorsementData.QueryHandler>();
 
@@ -68,21 +59,12 @@ public async void GetEndorsementData_OneEndorsementNotActive_Empty()
     [Theory]
     [InlineData("hpdid")]
     [InlineData("hpdid@bcsc")]
-    public async void GetEndorsementData_OneEndorsementNoCpn_MatchingHpdidEmptyLicences(string partyHpdid)
+    public async Task GetEndorsementData_OneEndorsementNoCpn_MatchingHpdidEmptyLicences(string hpdidQuery)
     {
-        var expectedHpdid = "expected";
-        this.TestDb.Has(APartyWith(id: 1, hpdid: partyHpdid));
-        this.TestDb.Has(APartyWith(id: 2, hpdid: expectedHpdid));
-        this.TestDb.Has(new Endorsement
-        {
-            Active = true,
-            EndorsementRelationships = new[]
-            {
-                new EndorsementRelationship { PartyId = 1 },
-                new EndorsementRelationship { PartyId = 2 }
-            }
-        });
-        var query = new EndorsementData.Query { Hpdid = "hpdid" }; // Should match either "hpdid" or "hpdid@bcsc" (the actual form for HPDID we get from Keycloak)
+        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid@bcsc"));
+        var otherParty = this.TestDb.Has(APartyWith(id: 2, hpdid: "anotherHpdid@bcsc"));
+        this.TestDb.Has(AnEndorsementBetween(1, 2));
+        var query = new EndorsementData.Query { Hpdid = hpdidQuery }; // Should match either "hpdid" or "hpdid@bcsc" (the actual form for HPDID we get from Keycloak and save in our database)
         var handler = this.MockDependenciesFor<EndorsementData.QueryHandler>();
 
         var result = await handler.HandleAsync(query);
@@ -91,15 +73,14 @@ public async void GetEndorsementData_OneEndorsementNoCpn_MatchingHpdidEmptyLicen
         Assert.Single(result.Value);
 
         var model = result.Value.Single();
-        Assert.Equal(expectedHpdid, model.Hpdid);
+        AssertBasicInfoMatches(otherParty, model);
         Assert.NotNull(model.Licences);
         Assert.Empty(model.Licences);
     }
 
     [Fact]
-    public async void GetEndorsementData_OneEndorsementWithCpn_MatchingHpdidWithLicences()
+    public async Task GetEndorsementData_OneEndorsementWithCpn_MatchingHpdidWithLicences()
     {
-        var expectedHpdid = "expected";
         var expectedCpn = "cpn";
         var expectedPlrRecords = new[]
         {
@@ -118,17 +99,9 @@ public async void GetEndorsementData_OneEndorsementWithCpn_MatchingHpdidWithLice
                 StatusReasonCode = "StatusReasonCode2"
             }
         };
-        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid"));
-        this.TestDb.Has(APartyWith(id: 2, hpdid: expectedHpdid, cpn: expectedCpn));
-        this.TestDb.Has(new Endorsement
-        {
-            Active = true,
-            EndorsementRelationships = new[]
-            {
-                new EndorsementRelationship { PartyId = 1 },
-                new EndorsementRelationship { PartyId = 2 }
-            }
-        });
+        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid@bcsc"));
+        var otherParty = this.TestDb.Has(APartyWith(id: 2, hpdid: "otherHpdid@bcsc", cpn: expectedCpn));
+        this.TestDb.Has(AnEndorsementBetween(1, 2));
         var query = new EndorsementData.Query { Hpdid = "hpdid" };
         var client = A.Fake<IPlrClient>();
         A.CallTo(() => client.GetRecordsAsync(expectedCpn))
@@ -141,62 +114,42 @@ public async void GetEndorsementData_OneEndorsementWithCpn_MatchingHpdidWithLice
         Assert.Single(result.Value);
 
         var model = result.Value.Single();
-        Assert.Equal(expectedHpdid, model.Hpdid);
+        AssertBasicInfoMatches(otherParty, model);
         Assert.NotNull(model.Licences);
         AssertThat.CollectionsAreEquivalent(expectedPlrRecords, model.Licences, RecordModelPredicate);
     }
 
     [Fact]
-    public async void GetEndorsementData_TwoEndorsementsWithCpn_MatchingHpdidsWithLicences()
+    public async Task GetEndorsementData_TwoEndorsementsWithCpn_MatchingHpdidsWithLicences()
     {
-        var expectedHpdid1 = "expected1";
-        var expectedHpdid2 = "expected2";
-        var expectedCpn1 = "cpn";
-        var expectedPlrRecords1 = new[]
+        var expectedCpn = "cpn";
+        var expectedPlrRecords = new[]
         {
             new PlrRecord
             {
-                Cpn = expectedCpn1,
+                Cpn = expectedCpn,
                 IdentifierType = "IdentifierType1",
                 StatusCode = "StatusCode1",
                 StatusReasonCode = "StatusReasonCode1"
             },
             new PlrRecord
             {
-                Cpn = expectedCpn1,
+                Cpn = expectedCpn,
                 IdentifierType = "IdentifierType2",
                 StatusCode = "StatusCode2",
                 StatusReasonCode = "StatusReasonCode2"
             }
         };
 
-        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid"));
-        this.TestDb.Has(APartyWith(id: 2, hpdid: expectedHpdid1, cpn: expectedCpn1));
-        this.TestDb.Has(APartyWith(id: 3, hpdid: expectedHpdid2));
-        this.TestDb.Has(new Endorsement
-        {
-            Active = true,
-            EndorsementRelationships = new[]
-            {
-                new EndorsementRelationship { PartyId = 1 },
-                new EndorsementRelationship { PartyId = 2 }
-            }
-        });
-        this.TestDb.Has(new Endorsement
-        {
-            Active = true,
-            EndorsementRelationships = new[]
-            {
-                new EndorsementRelationship { PartyId = 1 },
-                new EndorsementRelationship { PartyId = 3 }
-            }
-        });
+        this.TestDb.Has(APartyWith(id: 1, hpdid: "hpdid@bcsc"));
+        var licencedOtherParty = this.TestDb.Has(APartyWith(id: 2, hpdid: "otherHpdid@bcsc", cpn: expectedCpn));
+        var unlicencedOtherParty = this.TestDb.Has(APartyWith(id: 3, hpdid: "otherHpdid2@bcsc"));
+        this.TestDb.Has(AnEndorsementBetween(1, 2));
+        this.TestDb.Has(AnEndorsementBetween(1, 3));
         var query = new EndorsementData.Query { Hpdid = "hpdid" };
         var client = A.Fake<IPlrClient>();
-        A.CallTo(() => client.GetRecordsAsync(expectedCpn1, null))
-            .Returns(expectedPlrRecords1);
-        A.CallTo(() => client.GetRecordsAsync(expectedCpn1))
-            .Returns(expectedPlrRecords1);
+        A.CallTo(() => client.GetRecordsAsync(expectedCpn, null))
+            .Returns(expectedPlrRecords);
         var handler = this.MockDependenciesFor<EndorsementData.QueryHandler>(client);
 
         var result = await handler.HandleAsync(query);
@@ -204,13 +157,16 @@ public async void GetEndorsementData_TwoEndorsementsWithCpn_MatchingHpdidsWithLi
         Assert.True(result.IsSuccess);
         Assert.Equal(2, result.Value.Count);
 
-        var found = result.Value.SingleOrDefault(res => res.Hpdid == expectedHpdid1);
+        var found = result.Value.SingleOrDefault(res => res.Hpdid == licencedOtherParty.Credentials.Single().Hpdid);
         Assert.NotNull(found);
-        AssertThat.CollectionsAreEquivalent(expectedPlrRecords1, found!.Licences, RecordModelPredicate);
+        AssertBasicInfoMatches(licencedOtherParty, found);
+        AssertThat.CollectionsAreEquivalent(expectedPlrRecords, found.Licences, RecordModelPredicate);
 
-        found = result.Value.SingleOrDefault(res => res.Hpdid == expectedHpdid2);
+        found = result.Value.SingleOrDefault(res => res.Hpdid == unlicencedOtherParty.Credentials.Single().Hpdid);
         Assert.NotNull(found);
-        AssertThat.CollectionsAreEquivalent(Array.Empty<PlrRecord>(), found!.Licences, RecordModelPredicate);
+        AssertBasicInfoMatches(unlicencedOtherParty, found);
+        Assert.NotNull(found.Licences);
+        Assert.Empty(found.Licences);
     }
 
     public static Party APartyWith(int id, string hpdid, string? cpn = null)
@@ -219,14 +175,38 @@ public static Party APartyWith(int id, string hpdid, string? cpn = null)
         {
             Id = id,
             Cpn = cpn,
-            Credentials = new List<Credential>
-            {
+            FirstName = $"First{id}",
+            LastName = $"Last{id}",
+            Email = $"email@{id}.com",
+            Credentials =
+            [
                 new Credential
                 {
                     IdentityProvider = IdentityProviders.BCServicesCard,
                     IdpId = hpdid
                 }
-            }
+            ]
         };
     }
+
+    public static Endorsement AnEndorsementBetween(int partyId1, int partyId2, bool isActive = true)
+    {
+        return new Endorsement
+        {
+            Active = isActive,
+            EndorsementRelationships =
+            [
+                new EndorsementRelationship { PartyId = partyId1 },
+                new EndorsementRelationship { PartyId = partyId2 }
+            ]
+        };
+    }
+
+    private static void AssertBasicInfoMatches(Party expected, EndorsementData.Model actual)
+    {
+        Assert.Equal(expected.Credentials.Single().Hpdid, actual.Hpdid);
+        Assert.Equal(expected.FirstName, actual.FirstName);
+        Assert.Equal(expected.LastName, actual.LastName);
+        Assert.Equal(expected.Email, actual.Email);
+    }
 }
diff --git a/backend/webapi.tests/Testing Extensions/ContextExtensions.cs b/backend/webapi.tests/Testing Extensions/ContextExtensions.cs
index 6905e10e9..b53240a25 100644
--- a/backend/webapi.tests/Testing Extensions/ContextExtensions.cs	
+++ b/backend/webapi.tests/Testing Extensions/ContextExtensions.cs	
@@ -23,7 +23,7 @@ public static Party HasAParty(this PidpDbContext context, Action<Party>? config
     {
         var party = new Party();
         config?.Invoke(party);
-        if (!party.Credentials.Any())
+        if (party.Credentials.Count == 0)
         {
             party.Credentials.Add(new Credential { UserId = Guid.NewGuid() });
         }
diff --git a/backend/webapi/Features/Credentials/BCProvider.Create.cs b/backend/webapi/Features/Credentials/BCProvider.Create.cs
index 1c3f8e043..e1e03c201 100644
--- a/backend/webapi/Features/Credentials/BCProvider.Create.cs
+++ b/backend/webapi/Features/Credentials/BCProvider.Create.cs
@@ -2,7 +2,6 @@ namespace Pidp.Features.Credentials;
 
 using DomainResults.Common;
 using FluentValidation;
-using Flurl;
 using HybridModelBinding;
 using Microsoft.EntityFrameworkCore;
 using System.Text.Json.Serialization;
@@ -38,33 +37,20 @@ public CommandValidator()
         }
     }
 
-    public class CommandHandler : ICommandHandler<Command, IDomainResult<string>>
+    public class CommandHandler(
+        IBCProviderClient client,
+        IEmailService emailService,
+        IKeycloakAdministrationClient keycloakClient,
+        ILogger<CommandHandler> logger,
+        IPlrClient plrClient,
+        PidpDbContext context) : ICommandHandler<Command, IDomainResult<string>>
     {
-        private readonly IBCProviderClient client;
-        private readonly IEmailService emailService;
-        private readonly IKeycloakAdministrationClient keycloakClient;
-        private readonly ILogger<CommandHandler> logger;
-        private readonly IPlrClient plrClient;
-        private readonly PidpDbContext context;
-        private readonly Url keycloakAdministrationUrl;
-
-        public CommandHandler(
-            IBCProviderClient client,
-            IEmailService emailService,
-            IKeycloakAdministrationClient keycloakClient,
-            ILogger<CommandHandler> logger,
-            IPlrClient plrClient,
-            PidpConfiguration config,
-            PidpDbContext context)
-        {
-            this.client = client;
-            this.emailService = emailService;
-            this.keycloakClient = keycloakClient;
-            this.logger = logger;
-            this.plrClient = plrClient;
-            this.context = context;
-            this.keycloakAdministrationUrl = Url.Parse(config.Keycloak.AdministrationUrl);
-        }
+        private readonly IBCProviderClient client = client;
+        private readonly IEmailService emailService = emailService;
+        private readonly IKeycloakAdministrationClient keycloakClient = keycloakClient;
+        private readonly ILogger<CommandHandler> logger = logger;
+        private readonly IPlrClient plrClient = plrClient;
+        private readonly PidpDbContext context = context;
 
         public async Task<IDomainResult<string>> HandleAsync(Command command)
         {
@@ -136,6 +122,7 @@ public async Task<IDomainResult<string>> HandleAsync(Command command)
             var userId = await this.CreateKeycloakUser(party.FirstName, party.LastName, createdUser.UserPrincipalName);
             if (userId == null)
             {
+                this.logger.LogKeycloakUserCreationError(command.PartyId, createdUser.UserPrincipalName);
                 return DomainResult.Failed<string>();
             }
             await this.keycloakClient.UpdateUser(userId.Value, user => user.SetOpId(party.OpId!));
@@ -146,7 +133,7 @@ public async Task<IDomainResult<string>> HandleAsync(Command command)
                 PartyId = command.PartyId,
                 IdpId = createdUser.UserPrincipalName,
                 IdentityProvider = IdentityProviders.BCProvider,
-                DomainEvents = new List<IDomainEvent> { new CollegeLicenceUpdated(command.PartyId) }
+                DomainEvents = [new CollegeLicenceUpdated(command.PartyId)]
             });
 
             await this.context.SaveChangesAsync();
@@ -162,7 +149,7 @@ public async Task<IDomainResult<string>> HandleAsync(Command command)
                 Enabled = true,
                 FirstName = firstName,
                 LastName = lastName,
-                Username = this.GenerateMohKeycloakUsername(userPrincipalName)
+                Username = GenerateMohKeycloakUsername(userPrincipalName)
             };
             return await this.keycloakClient.CreateUser(newUser);
         }
@@ -171,19 +158,9 @@ public async Task<IDomainResult<string>> HandleAsync(Command command)
         /// The expected Ministry of Health Keycloak username for this user. The schema is {IdentityProviderIdentifier}@{IdentityProvider}.
         /// Most of our Credentials come to us from Keycloak and so the username is saved as-is in the column IdpId.
         /// However, we create BC Provider Credentials directly; so the User Principal Name is saved to the database without the suffix.
-        /// There are also two inconsistencies with how the MOH Keycloak handles BCP usernames:
-        /// 1. The username suffix is @bcp rather than @bcprovider_aad.
-        /// 2. This suffix is only added in Test and Production; there is no suffix at all for BCP Users in the Dev Keycloak.
+        /// Note that the username suffix for BC Provider is actually @bcp rather than @bcprovider_aad.
         /// </summary>
-        private string GenerateMohKeycloakUsername(string userPrincipalName)
-        {
-            if (this.keycloakAdministrationUrl.Host == "user-management-dev.api.hlth.gov.bc.ca")
-            {
-                return userPrincipalName;
-            }
-
-            return userPrincipalName + "@bcp";
-        }
+        private static string GenerateMohKeycloakUsername(string userPrincipalName) => userPrincipalName + "@bcp";
 
         private async Task SendBCProviderCreationEmail(string partyEmail, string userPrincipalName)
         {
@@ -207,6 +184,6 @@ public static partial class BCProviderCreateLoggingExtensions
     [LoggerMessage(2, LogLevel.Error, "Failed to create BC Provider for Party {partyId}, one or more requirements were not met. Party state: {state}.")]
     public static partial void LogInvalidState(this ILogger<BCProviderCreate.CommandHandler> logger, int partyId, object state);
 
-    [LoggerMessage(3, LogLevel.Error, "Error when attempting to create a Keycloak User for Party {partyId} with username {username}.")]
-    public static partial void LogKeycloakUserCreationError(this ILogger<BCProviderCreate.CommandHandler> logger, int partyId, string username);
+    [LoggerMessage(3, LogLevel.Error, "Error when attempting to create a Keycloak User for Party {partyId} from User Principal Name {userPrincipalName}.")]
+    public static partial void LogKeycloakUserCreationError(this ILogger<BCProviderCreate.CommandHandler> logger, int partyId, string userPrincipalName);
 }
diff --git a/backend/webapi/Features/Parties/Demographics.cs b/backend/webapi/Features/Parties/Demographics.cs
index 3f09a1280..076bfdfd3 100644
--- a/backend/webapi/Features/Parties/Demographics.cs
+++ b/backend/webapi/Features/Parties/Demographics.cs
@@ -63,16 +63,10 @@ public CommandValidator()
         }
     }
 
-    public class QueryHandler : IQueryHandler<Query, Command>
+    public class QueryHandler(IMapper mapper, PidpDbContext context) : IQueryHandler<Query, Command>
     {
-        private readonly IMapper mapper;
-        private readonly PidpDbContext context;
-
-        public QueryHandler(IMapper mapper, PidpDbContext context)
-        {
-            this.mapper = mapper;
-            this.context = context;
-        }
+        private readonly IMapper mapper = mapper;
+        private readonly PidpDbContext context = context;
 
         public async Task<Command> HandleAsync(Query query)
         {
@@ -83,11 +77,9 @@ public async Task<Command> HandleAsync(Query query)
         }
     }
 
-    public class CommandHandler : ICommandHandler<Command>
+    public class CommandHandler(PidpDbContext context) : ICommandHandler<Command>
     {
-        private readonly PidpDbContext context;
-
-        public CommandHandler(PidpDbContext context) => this.context = context;
+        private readonly PidpDbContext context = context;
 
         public async Task HandleAsync(Command command)
         {
@@ -95,8 +87,7 @@ public async Task HandleAsync(Command command)
                 .Include(party => party.Credentials)
                 .SingleAsync(party => party.Id == command.Id);
 
-            if (party.Email != null
-                && party.Email != command.Email)
+            if (party.Email != command.Email)
             {
                 party.DomainEvents.Add(new PartyEmailUpdated(party.Id, party.PrimaryUserId, command.Email!));
             }
@@ -111,11 +102,9 @@ public async Task HandleAsync(Command command)
         }
     }
 
-    public class PartyEmailUpdatedHandler : INotificationHandler<PartyEmailUpdated>
+    public class PartyEmailUpdatedHandler(IBus bus) : INotificationHandler<PartyEmailUpdated>
     {
-        private readonly IBus bus;
-
-        public PartyEmailUpdatedHandler(IBus bus) => this.bus = bus;
+        private readonly IBus bus = bus;
 
         public async Task Handle(PartyEmailUpdated notification, CancellationToken cancellationToken)
         {
@@ -126,24 +115,16 @@ public async Task Handle(PartyEmailUpdated notification, CancellationToken cance
         }
     }
 
-    public class PartyEmailUpdatedBcProviderConsumer : IConsumer<PartyEmailUpdated>
+    public class PartyEmailUpdatedBcProviderConsumer(
+        IBCProviderClient client,
+        PidpConfiguration config,
+        PidpDbContext context,
+        ILogger<PartyEmailUpdatedBcProviderConsumer> logger) : IConsumer<PartyEmailUpdated>
     {
-        private readonly IBCProviderClient client;
-        private readonly PidpDbContext context;
-        private readonly string bcProviderClientId;
-        private readonly ILogger<PartyEmailUpdatedBcProviderConsumer> logger;
-
-        public PartyEmailUpdatedBcProviderConsumer(
-            IBCProviderClient client,
-            PidpConfiguration config,
-            PidpDbContext context,
-            ILogger<PartyEmailUpdatedBcProviderConsumer> logger)
-        {
-            this.client = client;
-            this.context = context;
-            this.bcProviderClientId = config.BCProviderClient.ClientId;
-            this.logger = logger;
-        }
+        private readonly IBCProviderClient client = client;
+        private readonly PidpDbContext context = context;
+        private readonly string bcProviderClientId = config.BCProviderClient.ClientId;
+        private readonly ILogger<PartyEmailUpdatedBcProviderConsumer> logger = logger;
 
         public async Task Consume(ConsumeContext<PartyEmailUpdated> context)
         {
diff --git a/backend/webapi/Features/ThirdPartyIntegrations/EndorsementData.cs b/backend/webapi/Features/ThirdPartyIntegrations/EndorsementData.cs
index 49263ed61..8f5b3ce29 100644
--- a/backend/webapi/Features/ThirdPartyIntegrations/EndorsementData.cs
+++ b/backend/webapi/Features/ThirdPartyIntegrations/EndorsementData.cs
@@ -5,8 +5,8 @@ namespace Pidp.Features.ThirdPartyIntegrations;
 using Microsoft.EntityFrameworkCore;
 
 using Pidp.Data;
+using Pidp.Extensions;
 using Pidp.Infrastructure.HttpClients.Plr;
-using Pidp.Models;
 
 // Currently used by DMFT
 public class EndorsementData
@@ -18,8 +18,11 @@ public class Query : IQuery<IDomainResult<List<Model>>>
 
     public class Model
     {
-        public string? Hpdid { get; set; } = string.Empty;
-        public List<LicenceInformation> Licences { get; set; } = new();
+        public string? Hpdid { get; set; }
+        public string FirstName { get; set; } = string.Empty;
+        public string LastName { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
+        public List<LicenceInformation> Licences { get; set; } = [];
 
         public class LicenceInformation
         {
@@ -34,21 +37,19 @@ public class QueryValidator : AbstractValidator<Query>
         public QueryValidator() => this.RuleFor(x => x.Hpdid).NotEmpty();
     }
 
-    public class QueryHandler : IQueryHandler<Query, IDomainResult<List<Model>>>
+    public class QueryHandler(IPlrClient client, PidpDbContext context) : IQueryHandler<Query, IDomainResult<List<Model>>>
     {
-        private readonly IPlrClient client;
-        private readonly PidpDbContext context;
-
-        public QueryHandler(IPlrClient client, PidpDbContext context)
-        {
-            this.client = client;
-            this.context = context;
-        }
+        private readonly IPlrClient client = client;
+        private readonly PidpDbContext context = context;
 
         public async Task<IDomainResult<List<Model>>> HandleAsync(Query query)
         {
+            query.Hpdid = query.Hpdid.EndsWith("@bcsc", StringComparison.Ordinal)
+                ? query.Hpdid
+                : $"{query.Hpdid}@bcsc";
+
             var partyId = await this.context.Credentials
-                .Where(credential => credential.Hpdid!.Replace("@bcsc", "") == query.Hpdid)
+                .Where(credential => credential.Hpdid == query.Hpdid)
                 .Select(credential => credential.PartyId)
                 .SingleOrDefaultAsync();
 
@@ -57,16 +58,16 @@ public async Task<IDomainResult<List<Model>>> HandleAsync(Query query)
                 return DomainResult.NotFound<List<Model>>();
             }
 
-            var dtos = await this.context.Endorsements
-                .Where(endorsement => endorsement.Active
-                    && endorsement.EndorsementRelationships.Any(relationship => relationship.PartyId == partyId))
-                .SelectMany(endorsement => endorsement.EndorsementRelationships)
-                .Where(relationship => relationship.PartyId != partyId)
-                .Select(relationship => new Dto
+            var dtos = await this.context.ActiveEndorsingParties(partyId)
+                .Select(party => new
                 {
-                    BcscCredential = relationship.Party!.Credentials
-                        .SingleOrDefault(credential => credential.IsBcServicesCard),
-                    Cpn = relationship.Party!.Cpn
+                    Hpdid = party.Credentials
+                        .SingleOrDefault(credential => credential.IsBcServicesCard)!
+                        .IdpId,
+                    party.Cpn,
+                    party.FirstName,
+                    party.LastName,
+                    party.Email
                 })
                 .ToListAsync();
 
@@ -74,7 +75,10 @@ public async Task<IDomainResult<List<Model>>> HandleAsync(Query query)
 
             return DomainResult.Success(dtos.Select(dto => new Model
             {
-                Hpdid = dto.BcscCredential?.IdpId,
+                Hpdid = dto.Hpdid,
+                FirstName = dto.FirstName,
+                LastName = dto.LastName,
+                Email = dto.Email!,
                 Licences = licences?
                     .Where(licence => licence.Cpn == dto.Cpn)
                     .Select(licence => new Model.LicenceInformation
@@ -83,15 +87,9 @@ public async Task<IDomainResult<List<Model>>> HandleAsync(Query query)
                         StatusCode = licence.StatusCode,
                         StatusReasonCode = licence.StatusReasonCode
                     })
-                    .ToList() ?? new()
+                    .ToList() ?? []
             })
             .ToList());
         }
     }
-
-    private class Dto
-    {
-        public Credential? BcscCredential { get; set; }
-        public string? Cpn { get; set; }
-    }
 }
diff --git a/charts/webapi/values.yaml b/charts/webapi/values.yaml
index 79f48a3fb..2e235d629 100644
--- a/charts/webapi/values.yaml
+++ b/charts/webapi/values.yaml
@@ -78,11 +78,11 @@ ingress:
 
 resources:
   limits:
-    cpu: 100m
-    memory: 128Mi
+    cpu: 50m
+    memory: 200Mi
   requests:
     cpu: 15m
-    memory: 50Mi
+    memory: 150Mi
 
 autoscaling:
   enabled: false
@@ -110,7 +110,7 @@ fluentbit:
     runAsUser: 1001
   resources:
     limits:
-      cpu: 100m
+      cpu: 50m
       memory: 64Mi
     requests:
       cpu: 10m
diff --git a/workspace/apps/pidp/src/app/features/access/pages/access-requests-page/access-requests.page.scss b/workspace/apps/pidp/src/app/features/access/pages/access-requests-page/access-requests.page.scss
index 38fc650a6..8a380c2e5 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/access-requests-page/access-requests.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/access-requests-page/access-requests.page.scss
@@ -161,6 +161,7 @@
 
   .content-header h1 {
     font-size: 40px;
+    line-height: 1.1;
   }
 
   .breadcrumb {
@@ -208,6 +209,7 @@
 
   .content-header h1 {
     font-size: 40px;
+    line-height: 1.1;
   }
 
   .content-header {
diff --git a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.html b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.html
index 533b61e23..9353109bd 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.html
+++ b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.html
@@ -1,7 +1,7 @@
 <div class="container-box container" uiPidpInjectViewportCss>
   <div class="content-box">
     <header>
-      <h2>BC Provider account information</h2>
+      <h1>BC Provider account information</h1>
     </header>
     <div class="content">
       <h3>
@@ -185,7 +185,7 @@ <h3>You get more out of OneHealthID when you sign in with BC Provider.</h3>
       </div>
       <div class="password-splash">
         <div class="password-splash-content">
-          <div class="text-box">
+          <div class="text-box" >
             <div>
               <span class="lets">Let's get started</span>
             </div>
@@ -229,6 +229,11 @@ <h3>You get more out of OneHealthID when you sign in with BC Provider.</h3>
 
 <ng-template #passwordForm>
   <form novalidate [formGroup]="formState.form" (ngSubmit)="onSubmit()">
+    <div class="mobile-image">
+      <img
+      ngSrc="/assets/images/bcprovider-account-1000x1103.webp"
+      fill />
+    </div>
     <h2>Create an account</h2>
     <div class="form-content">
       <div class="field">
diff --git a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.scss b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.scss
index e704472e9..41b315373 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.scss
@@ -68,9 +68,16 @@ ol {
   --header-margin: unset;
   --avatar-size: 4rem;
   --content-padding: var(--gap);
-  --password-splash-display: none;
+  --password-splash-display: unset;
+}
+.viewport-medium {
+  --header-margin: var(--gap) 0 0;
+  --content-padding: var(--gap) 0;
+  --password-splash-display: unset;
+    --password-splash: {
+    flex: 1
+  }
 }
-.viewport-medium,
 .viewport-large {
   --header-margin: var(--gap) 0 0;
   --content-padding: var(--gap) 0;
@@ -80,10 +87,11 @@ ol {
 .viewport-all {
   & header {
     margin: var(--header-margin);
-    & h2 {
-      margin: 0;
-      padding: calc(var(--gap) / 2) calc(var(--gap) * 2);
-      background-color: pidp.$grey-10;
+    & h1 {
+      color: #036;
+      font-size: 3.125rem;
+      font-weight: 700;
+      margin-bottom: 0;
     }
   }
   & .content {
@@ -365,6 +373,12 @@ ol {
   & .help-link {
     font-size: 0.75rem;
   }
+  & .mobile-image{
+    & img {
+      display: none;
+    }
+  }
+
 }
 .viewport-all.dialog-box {
   padding: 24px;
@@ -426,4 +440,25 @@ ol {
       }
     }
   }
+  & .mobile-image{
+    & img {
+      display: block;
+      max-width: 100%;
+      height: auto;
+      position: relative !important;
+    }
+  }
+  & .form-card {
+    display: block !important;
+  }
+  & .password-splash {
+    & .password-splash-content {
+      & .text-box {
+        display: none !important;
+      }
+      & .image {
+        display: none !important;
+      }
+    }
+  }
 }
diff --git a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.ts b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.ts
index 6cf278c37..6638a5ab8 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.page.ts
@@ -41,9 +41,7 @@ import {
   faUser,
   faXmark,
 } from '@fortawesome/free-solid-svg-icons';
-import { DashboardStateModel, PidpStateName } from '@pidp/data-model';
 import {
-  AppStateService,
   LOADING_OVERLAY_DEFAULT_MESSAGE,
   LoadingOverlayService,
   NavigationService,
@@ -70,6 +68,11 @@ import { AuthRoutes } from '@app/features/auth/auth.routes';
 import { IdentityProvider } from '@app/features/auth/enums/identity-provider.enum';
 import { AuthService } from '@app/features/auth/services/auth.service';
 import { StatusCode } from '@app/features/portal/enums/status-code.enum';
+import {
+  DashboardStateModel,
+  PidpStateName,
+} from '@app/features/portal/models/state.model';
+import { AppStateService } from '@app/features/shell/services/app-state.service';
 import { NeedHelpComponent } from '@app/shared/components/need-help/need-help.component';
 import { DialogBcproviderCreateComponent } from '@app/shared/components/success-dialog/components/dialog-bcprovider-create.component';
 import { SuccessDialogComponent } from '@app/shared/components/success-dialog/success-dialog.component';
diff --git a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.route.ts b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.route.ts
index 1f8384c6b..16a5e35df 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.route.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-application/bc-provider-application.route.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { highAssuranceCredentialGuard } from '@app/features/auth/guards/high-assurance-credential.guard';
 import { bcProviderCompletedResolver } from '@app/features/auth/resolvers/bc-provider-completed.resolver';
 
@@ -15,13 +13,7 @@ export const routes: Routes = [
       bcProviderApplicationStatusCode: bcProviderApplicationResolver,
       hasCompletedBCProvider: bcProviderCompletedResolver,
     },
-    canActivate: [setDashboardTitleGuard, highAssuranceCredentialGuard],
+    canActivate: [highAssuranceCredentialGuard],
     component: BcProviderApplicationPage,
-    data: {
-      setDashboardTitleGuard: {
-        titleText: 'BC Provider and OneHealthID',
-        titleDescriptionText: '',
-      },
-    },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.page.html b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.page.html
index 556c7691e..734e7e9f7 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.page.html
+++ b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.page.html
@@ -1,7 +1,7 @@
 <div class="container-box container" uiPidpInjectViewportCss>
   <div class="content-box">
     <header>
-      <h2>BC Provider Account Information</h2>
+      <h1>BC Provider Account Information</h1>
     </header>
     <div class="content">
       <section class="error-card" [class.show-card]="showErrorCard">
@@ -58,6 +58,11 @@ <h2>BC Provider Account Information</h2>
 
 <ng-template #passwordForm>
   <form novalidate [formGroup]="formState.form" (ngSubmit)="onSubmit()">
+    <div class="mobile-image">
+      <img
+      src="/assets/images/bcprovider-account-1000x1103.webp"
+      fill/>
+    </div>
     <h2>Password reset</h2>
     <div class="username">
       <h4><strong>Provided username</strong></h4>
diff --git a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.page.scss b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.page.scss
index ddc77c79d..7f18acfff 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.page.scss
@@ -19,13 +19,43 @@
       margin-top: 20px;
     }
   }
+  & .mobile-image{
+    & img {
+      display: block !important;
+      max-width: 100%;
+      height: auto;
+      position: relative !important;
+    }
+  }
+  & .form-card {
+    display: block !important;
+  }
+  & .password-splash {
+    & .password-splash-content {
+      & .text-box {
+        display: none !important;
+      }
+      & .image {
+        display: none !important;
+      }
+    }
+  }
 }
 
 .viewport-all {
   --header-margin: unset;
   --avatar-size: 4rem;
   --content-padding: var(--gap);
-  --password-splash-display: none;
+  --password-splash-display: unset;
+}
+
+.viewport-medium {
+  --header-margin: var(--gap) 0 0;
+  --content-padding: var(--gap) 0;
+  --password-splash-display: unset;
+    --password-splash: {
+    flex: 1
+  }
 }
 
 .viewport-medium,
@@ -38,10 +68,11 @@
 .viewport-all {
   & header {
     margin: var(--header-margin);
-    & h2 {
-      margin: 0;
-      padding: calc(var(--gap) / 2) calc(var(--gap) * 2);
-      background-color: pidp.$grey-10;
+    & h1 {
+      color: #036;
+      font-size: 3.125rem;
+      font-weight: 700;
+      margin-bottom: 0;
     }
   }
   & .content {
@@ -198,6 +229,11 @@
       margin-top: var(--gap);
     }
   }
+  & .mobile-image{
+    & img {
+      display: none;
+    }
+  }
 }
 .viewport-all.dialog-box {
   padding: 24px;
@@ -240,3 +276,13 @@
     }
   }
 }
+
+.viewport-small,
+.viewport-xsmall {
+  & header {
+    & h1 {
+      font-size: 40px;
+      line-height: 1.1;
+    }
+  }
+}
diff --git a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.routes.ts b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.routes.ts
index 09d00f9e7..1bd5556c3 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.routes.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/bc-provider-edit/bc-provider-edit.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { highAssuranceCredentialGuard } from '@app/features/auth/guards/high-assurance-credential.guard';
 import { bcProviderEditResolver } from '@app/features/auth/resolvers/bc-provider-edit.resolver';
 
@@ -13,13 +11,7 @@ export const routes: Routes = [
     resolve: {
       hasCompletedBCProvider: bcProviderEditResolver,
     },
-    canActivate: [setDashboardTitleGuard, highAssuranceCredentialGuard],
+    canActivate: [highAssuranceCredentialGuard],
     component: BcProviderEditPage,
-    data: {
-      setDashboardTitleGuard: {
-        titleText: 'BC Provider and OneHealthID',
-        titleDescriptionText: '',
-      },
-    },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness-routing.routes.ts b/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness-routing.routes.ts
index 4c8007954..4e1a4309d 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { DriverFitnessPage } from './driver-fitness.page';
 import { driverFitnessResolver } from './driver-fitness.resolver';
 
@@ -9,15 +7,8 @@ export const routes: Routes = [
   {
     path: '',
     component: DriverFitnessPage,
-    canActivate: [setDashboardTitleGuard],
     resolve: {
       driverFitnessStatusCode: driverFitnessResolver,
     },
-    data: {
-      setDashboardTitleGuard: {
-        titleText: 'Driver Fitness Practitioner Portal Application',
-        titleDescriptionText: '',
-      },
-    },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.html b/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.html
index 33892f90e..703318070 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.html
+++ b/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.html
@@ -1,6 +1,6 @@
 <div class="box container" uiPidpInjectViewportCss>
   <header>
-    <h2 class="title">Enrolment</h2>
+    <h1 class="title">Enrolment</h1>
   </header>
 
   <div class="content">
diff --git a/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.scss b/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.scss
index cabba6280..c38286793 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.scss
@@ -33,9 +33,14 @@ span {
 .viewport-all {
   &.box {
     padding: var(--header-padding) 0 var(--header-padding) var(--header-padding);
+    h1 {
+      color: #036;
+      font-size: 3.125rem;
+      font-weight: 700;
+      margin-bottom: 0;
+    }
     & .title {
-      background-color: pidp.$bcgov-color-background-grey;
-      padding: 9px 24px;
+      padding: 1rem 0;
     }
   }
   & .content {
@@ -109,3 +114,13 @@ span {
     padding-left: 0;
   }
 }
+
+.viewport-small,
+.viewport-xsmall {
+  & header {
+    & h1 {
+      font-size: 40px;
+      line-height: 1.1;
+    }
+  }
+}
diff --git a/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.ts b/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.ts
index 2dd394938..0cadbee23 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/driver-fitness/driver-fitness.page.ts
@@ -7,7 +7,6 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { catchError, noop, of, tap } from 'rxjs';
 
 import {
-  ApplicationService,
   LOADING_OVERLAY_DEFAULT_MESSAGE,
   LoadingOverlayService,
 } from '@pidp/presentation';
@@ -21,6 +20,7 @@ import {
 import { PartyService } from '@app/core/party/party.service';
 import { LoggerService } from '@app/core/services/logger.service';
 import { StatusCode } from '@app/features/portal/enums/status-code.enum';
+import { ApplicationService } from '@app/features/shell/services/application.service';
 
 import { EnrolmentErrorComponent } from '../../components/enrolment-error/enrolment-error.component';
 import { DriverFitnessResource } from './driver-fitness-resource.service';
diff --git a/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer-routing.routes.ts b/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer-routing.routes.ts
index 655888777..1826366d9 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { HcimAccountTransferPage } from './hcim-account-transfer.page';
 import { hcimAccountTransferResolver } from './hcim-account-transfer.resolver';
 
@@ -9,7 +7,6 @@ export const routes: Routes = [
   {
     path: '',
     component: HcimAccountTransferPage,
-    canActivate: [setDashboardTitleGuard],
     resolve: {
       hcimAccountTransferStatusCode: hcimAccountTransferResolver,
     },
@@ -18,11 +15,6 @@ export const routes: Routes = [
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.html b/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.html
index f69f7d750..599aab8f1 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.html
+++ b/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.html
@@ -1,6 +1,6 @@
-<div class="container">
+<div class="container" uiPidpInjectViewportCss>
   <ui-page mode="full" [form]="formState.form" (submitted)="onSubmit()">
-    <ui-page-header>{{ title }}</ui-page-header>
+    <h1>{{ title }}</h1>
 
     <ng-container *ngIf="completed; else notCompleted">
       <ui-page-section>
diff --git a/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.scss b/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.scss
index 881c85e8c..98d25c46f 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.scss
@@ -1,3 +1,19 @@
 .viewport-all {
   padding: 1.25rem 0.75rem;
+
+  h1 {
+    color: #036;
+    font-size: 3.125rem;
+    font-weight: 700;
+    margin-bottom: 0;
+    padding: 2rem 0;
+  }
+}
+
+.viewport-small,
+.viewport-xsmall {
+  h1 {
+    font-size: 40px;
+    line-height: 1.1;
+  }
 }
diff --git a/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.ts b/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.ts
index 207d4b609..4504e7a37 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/hcim-account-transfer/hcim-account-transfer.page.ts
@@ -13,6 +13,7 @@ import {
   AlertComponent,
   AlertContentDirective,
   AnchorDirective,
+  InjectViewportCssClassDirective,
   PageComponent,
   PageFooterActionDirective,
   PageFooterComponent,
@@ -58,6 +59,7 @@ import {
     AlertComponent,
     AlertContentDirective,
     AnchorDirective,
+    InjectViewportCssClassDirective,
     MatButtonModule,
     MatFormFieldModule,
     MatInputModule,
diff --git a/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms-routing.routes.ts b/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms-routing.routes.ts
index bd8b80d5e..043ac53e0 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { ImmsBCEformsPage } from './immsbc-eforms.page';
 import { immsBCEformsResolver } from './immsbc-eforms.resolver';
 
@@ -9,7 +7,6 @@ export const routes: Routes = [
   {
     path: '',
     component: ImmsBCEformsPage,
-    canActivate: [setDashboardTitleGuard],
     resolve: {
       immsBCEformsStatusCode: immsBCEformsResolver,
     },
@@ -18,11 +15,6 @@ export const routes: Routes = [
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.html b/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.html
index 7cc4f5d38..6697ead91 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.html
+++ b/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.html
@@ -1,6 +1,6 @@
-<div class="container">
+<div class="container" uiPidpInjectViewportCss>
   <ui-page mode="full">
-    <ui-page-header>{{ title }}</ui-page-header>
+    <h1>{{ title }}</h1>
 
     <ui-alert
       *ngIf="accessRequestFailed"
diff --git a/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.scss b/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.scss
index 881c85e8c..1fe2e3dc5 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.scss
@@ -1,3 +1,18 @@
 .viewport-all {
   padding: 1.25rem 0.75rem;
+
+  h1 {
+    color: #036;
+    font-size: 3.125rem;
+    font-weight: 700;
+    margin-bottom: 0;
+    padding: 2rem 0;
+  }
+}
+.viewport-small,
+.viewport-xsmall {
+  h1 {
+    font-size: 40px;
+    line-height: 1.1;
+  }
 }
diff --git a/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.ts b/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.ts
index 9415123f2..10e610197 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/immsbc-eforms/immsbc-eforms.page.ts
@@ -10,6 +10,7 @@ import {
   AlertComponent,
   AlertContentDirective,
   AnchorDirective,
+  InjectViewportCssClassDirective,
   PageComponent,
   PageFooterActionDirective,
   PageFooterComponent,
@@ -42,6 +43,7 @@ import {
     AlertContentDirective,
     AnchorDirective,
     EnrolmentErrorComponent,
+    InjectViewportCssClassDirective,
     MatButtonModule,
     NgIf,
     PageComponent,
diff --git a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member-routing.routes.ts b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member-routing.routes.ts
index 9eea98d75..994ee4f36 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { MsTeamsClinicMemberPage } from './ms-teams-clinic-member.page';
 import { msTeamsClinicMemberResolver } from './ms-teams-clinic-member.resolver';
 
@@ -12,12 +10,7 @@ export const routes: Routes = [
     resolve: {
       msTeamsClinicMemberStatusCode: msTeamsClinicMemberResolver,
     },
-    canActivate: [setDashboardTitleGuard],
     data: {
-      setDashboardTitleGuard: {
-        titleText: 'MS Teams Clinic Member',
-        titleDescriptionText: 'Stay connected with team members',
-      },
       title: 'OneHealthID Service',
       routes: {
         root: '../../',
diff --git a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member.page.html b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member.page.html
index 4f6ae9d82..6275507f4 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member.page.html
+++ b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member.page.html
@@ -4,7 +4,7 @@
       <app-enrolment-error *ngIf="enrolmentError"></app-enrolment-error>
       <ng-container *ngIf="completed; else notCompleted">
         <header>
-          <h2 class="title">Thank you for enrolling for MS Teams access.</h2>
+          <h1 class="title">Thank you for enrolling for MS Teams access.</h1>
         </header>
         <section class="completed">
           <p>
diff --git a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member.page.scss b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member.page.scss
index af78ec419..7d5d223b9 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-clinic-member/ms-teams-clinic-member.page.scss
@@ -28,10 +28,12 @@
 
 .viewport-all {
   & header {
-    & h2 {
-      margin: 0;
-      padding: calc(var(--gap) / 2) calc(var(--gap));
-      background-color: pidp.$grey-10;
+    & h1 {
+      color: #036;
+      font-size: 3.125rem;
+      font-weight: 700;
+      margin-bottom: 0;
+      padding: 2rem 0;
     }
   }
   & .content {
@@ -106,3 +108,13 @@
     }
   }
 }
+
+.viewport-small,
+.viewport-xsmall {
+  & header {
+    & h1 {
+      font-size: 40px;
+      line-height: 1.1;
+    }
+  }
+}
diff --git a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer-routing.routes.ts b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer-routing.routes.ts
index 505acdef5..bbf856d77 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { MsTeamsPrivacyOfficerPage } from './ms-teams-privacy-officer.page';
 import { msTeamsPrivacyOfficerResolver } from './ms-teams-privacy-officer.resolver';
 
@@ -12,13 +10,7 @@ export const routes: Routes = [
     resolve: {
       msTeamsPrivacyOfficerStatusCode: msTeamsPrivacyOfficerResolver,
     },
-    canActivate: [setDashboardTitleGuard],
     data: {
-      setDashboardTitleGuard: {
-        titleText: 'MS Teams Privacy Officer',
-        titleDescriptionText:
-          'Here you can add your clinic information and access MS Teams',
-      },
       title: 'OneHealthID Service',
       routes: {
         root: '../../',
diff --git a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer.page.html b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer.page.html
index 4137a51c7..7002527bb 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer.page.html
+++ b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer.page.html
@@ -52,7 +52,7 @@ <h3>Endorsement</h3>
       </ng-container>
       <ng-template #notCompleted>
         <header>
-          <h2 class="title">Welcome to your MS Teams enrolment application.</h2>
+          <h1>Welcome to your MS Teams enrolment application.</h1>
         </header>
         <ng-container [ngSwitch]="currentPage">
           <ng-container *ngSwitchCase="0">
diff --git a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer.page.scss b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer.page.scss
index 24f6de328..3d2d9463b 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/ms-teams-privacy-officer/ms-teams-privacy-officer.page.scss
@@ -47,9 +47,11 @@
 .viewport-all {
   &.box {
     padding: var(--header-padding) 0 var(--header-padding) var(--header-padding);
-    & .title {
-      background-color: pidp.$bcgov-color-background-grey;
-      padding: 9px 24px;
+    h1 {
+      color: #036;
+      font-size: 3.125rem;
+      font-weight: 700;
+      margin-bottom: 0;
     }
   }
   & header {
@@ -146,3 +148,23 @@
     }
   }
 }
+
+.viewport-large,
+.viewport-medium,
+.viewport-small,
+.viewport-xsmall {
+  & header {
+    & h1 {
+      line-height: 1.1;
+    }
+  }
+}
+
+.viewport-small,
+.viewport-xsmall {
+  & header {
+    & h1 {
+      font-size: 40px;
+    }
+  }
+}
diff --git a/workspace/apps/pidp/src/app/features/access/pages/prescription-refill-eforms/prescription-refill-eforms-routing.routes.ts b/workspace/apps/pidp/src/app/features/access/pages/prescription-refill-eforms/prescription-refill-eforms-routing.routes.ts
index 7c97fa28d..840eeca22 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/prescription-refill-eforms/prescription-refill-eforms-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/prescription-refill-eforms/prescription-refill-eforms-routing.routes.ts
@@ -15,11 +15,6 @@ export const routes: Routes = [
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal-routing.routes.ts b/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal-routing.routes.ts
index 5e6a808fc..8360dd7f3 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal-routing.routes.ts
@@ -15,11 +15,6 @@ export const routes: Routes = [
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.html b/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.html
index ec77d3045..d84ea4e77 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.html
+++ b/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.html
@@ -1,5 +1,6 @@
+<div class="container" uiPidpInjectViewportCss>
 <ui-page mode="full">
-  <ui-page-header>{{ title }}</ui-page-header>
+  <h1>{{ title }}</h1>
 
   <ui-alert
     *ngIf="accessRequestFailed"
@@ -82,3 +83,4 @@
     </button>
   </ui-page-footer>
 </ui-page>
+</div>
diff --git a/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.scss b/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.scss
index e69de29bb..36b1c5699 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.scss
@@ -0,0 +1,18 @@
+.viewport-all {
+  padding: 1.25rem 0.75rem;
+  h1 {
+    color: #036;
+    font-size: 3.125rem;
+    font-weight: 700;
+    margin-bottom: 0;
+    padding: 2rem 0;
+  }
+}
+
+.viewport-small,
+.viewport-xsmall {
+  h1 {
+    font-size: 40px;
+    line-height: 1.1;
+  }
+}
diff --git a/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.ts b/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.ts
index 528e04081..ce0d021c3 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/provider-reporting-portal/provider-reporting-portal.page.ts
@@ -10,6 +10,7 @@ import {
   AlertComponent,
   AlertContentDirective,
   AnchorDirective,
+  InjectViewportCssClassDirective,
   PageComponent,
   PageFooterActionDirective,
   PageFooterComponent,
@@ -38,6 +39,7 @@ import { ProviderReportingPortalResource } from './provider-reporting-portal-res
     AlertContentDirective,
     AnchorDirective,
     EnrolmentErrorComponent,
+    InjectViewportCssClassDirective,
     MatButtonModule,
     NgIf,
     PageComponent,
diff --git a/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system-routing.routes.ts b/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system-routing.routes.ts
index 0f67aa057..2d8cca063 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { ProvincialAttachmentSystemPage } from './provincial-attachment-system.page';
 import { provincialAttachmentSystemResolver } from './provincial-attachment-system.resolver';
 
@@ -9,15 +7,8 @@ export const routes: Routes = [
   {
     path: '',
     component: ProvincialAttachmentSystemPage,
-    canActivate: [setDashboardTitleGuard],
     resolve: {
       provincialAttachmentSystemStatusCode: provincialAttachmentSystemResolver,
     },
-    data: {
-      setDashboardTitleGuard: {
-        titleText: 'Provincial Attachment System',
-        titleDescriptionText: '',
-      },
-    },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.html b/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.html
index 14c1ebc17..0897e9695 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.html
+++ b/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.html
@@ -171,38 +171,53 @@ <h1>Enrol for Access</h1>
           </mat-step>
         </mat-stepper>
       </div>
-      <div class="card pas-button">
-        <img
-          class="img-doctor"
-          ngSrc="/assets/images/doctor.jpg"
-          alt="doctor"
-          priority
-          fill />
-        <div class="card-container auth-card">
-          <div class="card-header auth-card-header">
-            <h3><strong>Provincial Attachment System</strong></h3>
+      <div class="pas-button-container">
+        <div class="card pas-button">
+          <img
+            class="img-doctor"
+            ngSrc="/assets/images/doctor1.jpg"
+            alt="doctor"
+            priority
+            fill />
+          <div class="card-container auth-card">
+            <div class="card-header auth-card-header">
+              <h3><strong>Provincial Attachment System</strong></h3>
+            </div>
+            <div class="card-body auth-card-body">
+              <img
+                class="logo"
+                ngSrc="/assets/images/doctors-bc-logo.png"
+                alt="Doctors of BC logo"
+                priority
+                fill />
+            </div>
+            <div class="card-footer auth-card-footer">
+              <button
+                mat-flat-button
+                uiPageFooterAction
+                type="submit"
+                color="primary"
+                aria-labelledby="navigate-to-pas"
+                [disabled]="pas$ | async"
+                (click)="navigateTo()">
+                Login
+              </button>
+            </div>
           </div>
-          <div class="card-body auth-card-body">
-            <img
-              class="logo"
-              ngSrc="/assets/images/doctors-bc-logo.png"
-              alt="Doctors of BC logo"
-              priority
-              fill />
+        </div>
+        <ng-container *ngIf="hasCpn && (pas$ | async)">
+          <div class="pas-button-text">
+            <i>You will need BCProvider credential before logging in.</i>
           </div>
-          <div class="card-footer auth-card-footer">
-            <button
-              mat-flat-button
-              uiPageFooterAction
-              type="submit"
-              color="primary"
-              aria-labelledby="navigate-to-pas"
-              [disabled]="pas$ | async"
-              (click)="navigateTo()">
-              Login
-            </button>
+        </ng-container>
+        <ng-container *ngIf="!hasCpn && (pas$ | async)">
+          <div class="pas-button-text">
+            <i
+              >You will need BCProvider credential, and an endorsement before
+              logging in.</i
+            >
           </div>
-        </div>
+        </ng-container>
       </div>
     </section>
   </div>
diff --git a/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.scss b/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.scss
index 549439cb0..51d76478d 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.scss
@@ -81,6 +81,11 @@
       }
       .pas-button {
         height: 15rem;
+        background: linear-gradient(
+          270deg,
+          rgba(0, 0, 0, 0) 0%,
+          rgba(158, 204, 211, 1) 100%
+        );
         img {
           object-fit: cover;
           z-index: -2;
@@ -91,7 +96,7 @@
         }
 
         div.auth-card {
-          padding: 20px 0px 55px 50px;
+          padding: 23px 0px 7px 34px;
         }
 
         .card-container {
@@ -116,7 +121,7 @@
 
           .card-body {
             img.logo {
-              z-index: -1;
+              z-index: 0;
               -webkit-transform: none;
               transform: none;
               position: relative !important;
@@ -128,11 +133,15 @@
 
           .card-footer {
             button {
+              z-index: 1;
               padding: 10px 25px;
             }
           }
         }
       }
+      .pas-button-text {
+        font-size: smaller;
+      }
     }
   }
 }
@@ -144,6 +153,7 @@
 
   .content-header h1 {
     font-size: 40px;
+    line-height: 1.1;
   }
 
   .breadcrumb {
@@ -153,6 +163,10 @@
     display: flex !important;
     flex-direction: column !important;
 
+    .pas-step-label {
+      line-height: 1.1;
+    }
+
     .pas-button {
       img.img-doctor {
         height: 15rem !important;
@@ -204,6 +218,11 @@
 
 .stepper-buttons {
   margin-top: 10px;
+  & button {
+    border: pidp.$bcgov-color-primary solid 2px;
+    color: pidp.$bcgov-color-primary;
+    font-weight: bold;
+  }
 
   & button:last-child {
     margin-left: 10px;
diff --git a/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.ts b/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.ts
index c8e6e1e35..df9d02d2f 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/provincial-attachment-system/provincial-attachment-system.page.ts
@@ -30,7 +30,6 @@ import { AuthService } from '@app/features/auth/services/auth.service';
 import { StatusCode } from '@app/features/portal/enums/status-code.enum';
 import { ProfileStatus } from '@app/features/portal/models/profile-status.model';
 import { PortalResource } from '@app/features/portal/portal-resource.service';
-import { PortalService } from '@app/features/portal/portal.service';
 
 import { BcProviderEditResource } from '../bc-provider-edit/bc-provider-edit-resource.service';
 import { BcProviderEditInitialStateModel } from '../bc-provider-edit/bc-provider-edit.page';
@@ -92,7 +91,6 @@ export class ProvincialAttachmentSystemPage implements OnInit {
     private discoveryResource: DiscoveryResource,
     private navigationService: NavigationService,
     private portalResource: PortalResource,
-    private portalService: PortalService,
     private partyService: PartyService,
     private router: Router,
     private toastService: ToastService,
@@ -127,74 +125,50 @@ export class ProvincialAttachmentSystemPage implements OnInit {
       this.partyService.partyId,
     );
 
-    this.updateState(profileStatus$);
-    this.handlePasBannerStatus(profileStatus$);
-    this.handlePasStatus(profileStatus$);
+    this.handleStepperState(profileStatus$);
   }
 
-  private updateState(profileStatus$: Observable<ProfileStatus | null>): void {
-    profileStatus$
-      .pipe(
-        tap((profileStatus: ProfileStatus | null) => {
-          this.portalService.updateState(profileStatus);
-        }),
-      )
-      .subscribe();
-  }
-
-  private handlePasBannerStatus(
-    profileStatus$: Observable<ProfileStatus | null>,
-  ): void {
-    profileStatus$
-      .pipe(
-        switchMap(
-          (
-            profileStatus,
-          ): Observable<BcProviderEditInitialStateModel | null> => {
-            let selectedIndex = this.lastSelectedIndex;
-            this.hasCpn = profileStatus?.status.collegeCertification.hasCpn;
-
-            this.bcProviderStatusCode =
-              profileStatus?.status.bcProvider.statusCode;
-            if (this.bcProviderStatusCode === StatusCode.COMPLETED) {
-              this.bcProvider$.next(true);
-              return this.bcProviderResource.get(this.partyService.partyId);
-            } else {
-              if (selectedIndex === this.lastSelectedIndex) {
-                // BCProvider step
-                selectedIndex = 0;
-              }
-              this.selectedIndex = selectedIndex;
-              return of(null);
-            }
-          },
-        ),
-        tap((bcProviderObject: BcProviderEditInitialStateModel | null) => {
-          if (bcProviderObject) {
-            this.bcProviderUsername = bcProviderObject.bcProviderId;
-          }
-        }),
-      )
-      .subscribe();
-  }
-
-  private handlePasStatus(
+  private handleStepperState(
     profileStatus$: Observable<ProfileStatus | null>,
   ): void {
+    let selectedIndex = this.lastSelectedIndex;
     profileStatus$
       .pipe(
         tap((profileStatus: ProfileStatus | null) => {
-          let selectedIndex = this.lastSelectedIndex;
+          this.hasCpn = profileStatus?.status.collegeCertification.hasCpn;
           this.pasStatusCode =
             profileStatus?.status.provincialAttachmentSystem.statusCode;
+          this.bcProviderStatusCode =
+            profileStatus?.status.bcProvider.statusCode;
           if (this.pasStatusCode === StatusCode.COMPLETED) {
             this.pas$.next(false);
-          } else if (selectedIndex === this.lastSelectedIndex) {
+          } else if (
+            selectedIndex === this.lastSelectedIndex &&
+            this.bcProviderStatusCode === StatusCode.COMPLETED
+          ) {
             // PAS step
             selectedIndex = 1;
           }
           this.selectedIndex = selectedIndex;
         }),
+        switchMap((): Observable<BcProviderEditInitialStateModel | null> => {
+          if (this.bcProviderStatusCode === StatusCode.COMPLETED) {
+            this.bcProvider$.next(true);
+            return this.bcProviderResource.get(this.partyService.partyId);
+          } else {
+            if (selectedIndex === this.lastSelectedIndex) {
+              // BCProvider step
+              selectedIndex = 0;
+            }
+            this.selectedIndex = selectedIndex;
+            return of(null);
+          }
+        }),
+        tap((bcProviderObject: BcProviderEditInitialStateModel | null) => {
+          if (bcProviderObject) {
+            this.bcProviderUsername = bcProviderObject.bcProviderId;
+          }
+        }),
       )
       .subscribe();
   }
diff --git a/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms-routing.routes.ts b/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms-routing.routes.ts
index 00932d94f..60bdc9a87 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { SaEformsPage } from './sa-eforms.page';
 import { saEformsResolver } from './sa-eforms.resolver';
 
@@ -9,7 +7,6 @@ export const routes: Routes = [
   {
     path: '',
     component: SaEformsPage,
-    canActivate: [setDashboardTitleGuard],
     resolve: {
       saEformsStatusCode: saEformsResolver,
     },
@@ -18,11 +15,6 @@ export const routes: Routes = [
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.html b/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.html
index 392c4a090..4c35b3027 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.html
+++ b/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.html
@@ -1,6 +1,6 @@
-<div class="container">
+<div class="container" uiPidpInjectViewportCss>
   <ui-page mode="full">
-    <ui-page-header>{{ title }}</ui-page-header>
+    <h1>{{ title }}</h1>
 
     <ui-alert
       *ngIf="accessRequestFailed"
diff --git a/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.scss b/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.scss
index e8e11af91..e0a5e7d7b 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.scss
+++ b/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.scss
@@ -6,4 +6,19 @@
 
 .viewport-all {
   padding: 1.25rem 0.75rem;
+  h1 {
+    color: #036;
+    font-size: 3.125rem;
+    font-weight: 700;
+    margin-bottom: 0;
+    padding: 2rem 0;
+  }
+}
+
+.viewport-small,
+.viewport-xsmall {
+  h1 {
+    font-size: 40px;
+    line-height: 1.1;
+  }
 }
diff --git a/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.ts b/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.ts
index 03041a740..e126c95e6 100644
--- a/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.ts
+++ b/workspace/apps/pidp/src/app/features/access/pages/sa-eforms/sa-eforms.page.ts
@@ -10,6 +10,7 @@ import {
   AlertComponent,
   AlertContentDirective,
   AnchorDirective,
+  InjectViewportCssClassDirective,
   PageComponent,
   PageFooterActionDirective,
   PageFooterComponent,
@@ -42,6 +43,7 @@ import {
     AlertContentDirective,
     AnchorDirective,
     EnrolmentErrorComponent,
+    InjectViewportCssClassDirective,
     MatButtonModule,
     NgIf,
     PageComponent,
diff --git a/workspace/apps/pidp/src/app/features/auth/auth-routing.routes.ts b/workspace/apps/pidp/src/app/features/auth/auth-routing.routes.ts
index 2134b1663..5d395e4ff 100644
--- a/workspace/apps/pidp/src/app/features/auth/auth-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/auth/auth-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { PortalDashboardComponent } from '../shell/components/portal-dashboard/portal-dashboard.component';
 import { AuthRoutes } from './auth.routes';
 import { authorizationRedirectGuard } from './guards/authorization-redirect.guard';
@@ -14,16 +12,12 @@ import { LoginPage } from './pages/login/login.page';
 export const routes: Routes = [
   {
     path: AuthRoutes.PORTAL_LOGIN,
-    canActivate: [authorizationRedirectGuard, setDashboardTitleGuard],
+    canActivate: [authorizationRedirectGuard],
     component: LoginPage,
     data: {
       loginPageData: {
         isAdminLogin: false,
       },
-      setDashboardTitleGuard: {
-        titleText: '',
-        titleDescriptionText: '',
-      },
     },
   },
   {
diff --git a/workspace/apps/pidp/src/app/features/auth/pages/link-account-confirm/link-account-confirm.page.scss b/workspace/apps/pidp/src/app/features/auth/pages/link-account-confirm/link-account-confirm.page.scss
index 89484a16d..40663748b 100644
--- a/workspace/apps/pidp/src/app/features/auth/pages/link-account-confirm/link-account-confirm.page.scss
+++ b/workspace/apps/pidp/src/app/features/auth/pages/link-account-confirm/link-account-confirm.page.scss
@@ -79,60 +79,59 @@
         line-height: 1.5rem;
       }
 
-            & .card-styles {
-              border-radius: 1.25rem;
-              border: 1px solid #ccc;
-              background: #fff;
-              box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
-              width: auto;
-              height: 11.875rem;
-              padding: 1.25rem;
-
-              h2 {
-                color: #036;
-                font-size: 1.5rem;
-                font-weight: 700;
-                padding-top: 0.25rem;
-                margin-bottom: 0;
-              }
-
-              p {
-                color: #000;
-                font-size: 1rem;
-                font-weight: 400;
-                padding-top: 0;
-                margin-bottom: 0;
-                line-height: 1.5;
-              }
-
-              a {
-                color: var(--Links, #1a5a96);
-                font-size: 16px;
-                font-weight: 400;
-                line-height: 27px;
-                text-decoration: underline;
-                cursor: pointer;
-              }
-
-
-              .linked-success {
-                display: flex;
-                justify-content: start;
-                align-items: center;
-
-                span {
-                  color: #2E8540;
-                  font-size: 16px;
-                  font-weight: 700;
-                  margin-right: 5px;
-                }
-
-                img {
-                  width: 1.5rem;
-                  height: 1.5rem;
-                }
-              }
-            }
+      & .card-styles {
+        border-radius: 1.25rem;
+        border: 1px solid #ccc;
+        background: #fff;
+        box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
+        width: auto;
+        height: 11.875rem;
+        padding: 1.25rem;
+
+        h2 {
+          color: #036;
+          font-size: 1.5rem;
+          font-weight: 700;
+          padding-top: 0.25rem;
+          margin-bottom: 0;
+        }
+
+        p {
+          color: #000;
+          font-size: 1rem;
+          font-weight: 400;
+          padding-top: 0;
+          margin-bottom: 0;
+          line-height: 1.5;
+        }
+
+        a {
+          color: var(--Links, #1a5a96);
+          font-size: 16px;
+          font-weight: 400;
+          line-height: 27px;
+          text-decoration: underline;
+          cursor: pointer;
+        }
+
+        .linked-success {
+          display: flex;
+          justify-content: start;
+          align-items: center;
+
+          span {
+            color: #2e8540;
+            font-size: 16px;
+            font-weight: 700;
+            margin-right: 5px;
+          }
+
+          img {
+            width: 1.5rem;
+            height: 1.5rem;
+          }
+        }
+      }
 
       & .instructions-card-layout {
         width: auto;
@@ -163,6 +162,7 @@
 
           .sublist {
             list-style-type: '-';
+
             li {
               padding-left: 0.25rem;
             }
@@ -218,9 +218,11 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+
         .lock-icon {
           cursor: pointer;
         }
+
         .card-icon {
           display: flex;
           border-radius: 0.625rem;
@@ -241,6 +243,7 @@
       .idir-account {
         margin-top: 1.19rem;
       }
+
       .link-button {
         height: 67%;
 
@@ -380,10 +383,12 @@
 div.viewport-xsmall {
   --gap: 0.5rem;
   --font-size: 0.5rem;
+
   & .content {
     & .link-main {
       display: flex !important;
       flex-direction: column !important;
+
       & .instructions-card {
         h2 {
           padding: 1rem 0rem 0 1rem;
@@ -394,28 +399,35 @@ div.viewport-xsmall {
           padding-left: 1.5rem;
         }
       }
+
       .instructions-card-layout {
         button {
           margin: 4.7rem 0 1rem 1.5rem;
         }
+
         .instructions-text {
           margin: 5.5rem 0 1rem 1.5rem;
         }
+
         & .instructions-container {
           padding: 1rem 0rem 0 1rem;
+
           h2 {
             margin-bottom: 0.25rem;
             font-size: 1rem;
           }
+
           ol,
           ul {
             margin-left: 0rem;
           }
+
           .list-item {
             padding-bottom: 0rem;
           }
         }
       }
+
       .card-styles {
         padding: 1rem;
 
@@ -461,9 +473,11 @@ div.viewport-xsmall {
 div.viewport-small {
   --gap: 0.5rem;
   --font-size: 0.5rem;
+
   & .content {
     & .link-main {
       grid-template-columns: calc(39% - 15px) calc(30% - 15px) calc(30% - 15px);
+
       & .instructions-card {
         h2 {
           padding: 0.75rem 3.75rem 0 0.75rem;
@@ -474,28 +488,35 @@ div.viewport-small {
           padding-left: 0.75rem;
         }
       }
+
       .instructions-card-layout {
         button {
           margin: 0rem 0 1rem 1.5rem;
         }
+
         .instructions-text {
           margin: 6.3rem 0 1rem 1.5rem;
         }
+
         & .instructions-container {
           padding: 0.75rem 0rem 0 0.75rem;
+
           h2 {
             margin-bottom: 0.25rem;
             font-size: 1rem;
           }
+
           ol,
           ul {
             margin-left: 0rem;
           }
+
           .list-item {
             padding-bottom: 0rem;
           }
         }
       }
+
       .card-styles {
         padding: 1rem;
 
@@ -539,27 +560,34 @@ div.viewport-medium {
           padding-left: 1.5rem;
         }
       }
+
       .instructions-card-layout {
         button {
           margin: 0rem 0 1rem 1.5rem;
         }
+
         .instructions-text {
           margin: 5rem 0 1rem 1.5rem;
         }
+
         & .instructions-container {
           padding: 1rem 0rem 0 1rem;
+
           h2 {
             margin-bottom: 0.25rem;
           }
+
           ol,
           ul {
             margin-left: 0rem;
           }
+
           .list-item {
             padding-bottom: 0.25rem;
           }
         }
       }
+
       .card-styles {
         padding: 1rem;
 
@@ -588,9 +616,3 @@ div.viewport-medium {
     }
   }
 }
-
-::ng-deep .dialog-container {
-  mat-dialog-container {
-      padding: 0.5rem;
-  }
-}
diff --git a/workspace/apps/pidp/src/app/features/auth/pages/link-account-confirm/link-account-confirm.page.ts b/workspace/apps/pidp/src/app/features/auth/pages/link-account-confirm/link-account-confirm.page.ts
index 285155dc3..28798da9f 100644
--- a/workspace/apps/pidp/src/app/features/auth/pages/link-account-confirm/link-account-confirm.page.ts
+++ b/workspace/apps/pidp/src/app/features/auth/pages/link-account-confirm/link-account-confirm.page.ts
@@ -77,6 +77,7 @@ export class LinkAccountConfirmPage implements OnInit {
             height: '26rem',
             actionText: 'Correct',
             actionTypePosition: 'center',
+            class: 'dialog-container dialog-padding',
           };
           return this.dialog
             .open(ConfirmDialogComponent, {
diff --git a/workspace/apps/pidp/src/app/features/faq/pages/help/help-routing.routes.ts b/workspace/apps/pidp/src/app/features/faq/pages/help/help-routing.routes.ts
index fe828c6d1..961a6eda6 100644
--- a/workspace/apps/pidp/src/app/features/faq/pages/help/help-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/faq/pages/help/help-routing.routes.ts
@@ -1,24 +1,16 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
 import { HelpPage } from './help.page';
 
-
 export const routes: Routes = [
   {
     path: '',
     component: HelpPage,
-    canActivate: [setDashboardTitleGuard],
     data: {
       title: 'OneHealthID Service',
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.html b/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.html
index 0e56594dd..9b846144f 100644
--- a/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.html
+++ b/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.html
@@ -2,14 +2,15 @@
   <nav class="breadcrumb">
     <ul>
       <li><a (click)="onBack()">Home</a></li>
-      <li> <fa-icon [icon]="faAngleRight" class="fa-duotone"></fa-icon> </li>
-      <li> <a class="active">Active Page</a></li>
+      <li><fa-icon class="fa-duotone" [icon]="faAngleRight"></fa-icon></li>
+      <li><a class="active">Active Page</a></li>
     </ul>
   </nav>
   <h1>Frequently asked questions</h1>
   <div class="faq-section">
     <div class="faq-item">
       <mat-expansion-panel
+        class="faq-expansion-panel"
         (opened)="panelOpenState.set(true)"
         (closed)="panelOpenState.set(false)">
         <mat-expansion-panel-header>
@@ -31,6 +32,7 @@ <h1>Frequently asked questions</h1>
     </div>
     <div class="faq-item">
       <mat-expansion-panel
+        class="faq-expansion-panel"
         (opened)="panelOpenState.set(true)"
         (closed)="panelOpenState.set(false)">
         <mat-expansion-panel-header>
@@ -53,6 +55,7 @@ <h1>Frequently asked questions</h1>
     </div>
     <div class="faq-item">
       <mat-expansion-panel
+        class="faq-expansion-panel"
         (opened)="panelOpenState.set(true)"
         (closed)="panelOpenState.set(false)">
         <mat-expansion-panel-header>
@@ -80,6 +83,7 @@ <h1>Frequently asked questions</h1>
     </div>
     <div class="faq-item">
       <mat-expansion-panel
+        class="faq-expansion-panel"
         (opened)="panelOpenState.set(true)"
         (closed)="panelOpenState.set(false)">
         <mat-expansion-panel-header>
@@ -95,7 +99,7 @@ <h1>Frequently asked questions</h1>
           number of provincial health applications (backed by BC Services Card)
           and is aligned to policy.<br />
           The BCProvider credential is created during the enrolment process<br />
-          <a href="https://healthprovideridentityportal.gov.bc.ca/auth/login"
+          <a [href]="applicationUrl"
             >https://healthprovideridentityportal.gov.bc.ca/auth/login</a
           >
         </p>
@@ -103,6 +107,7 @@ <h1>Frequently asked questions</h1>
     </div>
     <div class="faq-item">
       <mat-expansion-panel
+        class="faq-expansion-panel"
         (opened)="panelOpenState.set(true)"
         (closed)="panelOpenState.set(false)">
         <mat-expansion-panel-header>
@@ -141,11 +146,15 @@ <h1>Frequently asked questions</h1>
           For more information on the BC Services Card and Provider Location
           Registry, please refer to: <br />BCSC.
           <a
+            uiAnchor
+            scheme="url"
             href="https://www2.gov.bc.ca/gov/content/governments/government-id/bc-services-card"
             >https://www2.gov.bc.ca/gov/content/governments/government-id/bc-services-card</a
           ><br />
           PLR.
           <a
+            uiAnchor
+            scheme="url"
             href="https://www2.gov.bc.ca/gov/content/health/practitioner-professional-resources/system-access/provider-location-registry-plr"
             >https://www2.gov.bc.ca/gov/content/health/practitioner-professional-resources/system-access/provider-location-registry-plr</a
           >
@@ -154,6 +163,7 @@ <h1>Frequently asked questions</h1>
     </div>
     <div class="faq-item">
       <mat-expansion-panel
+        class="faq-expansion-panel"
         (opened)="panelOpenState.set(true)"
         (closed)="panelOpenState.set(false)">
         <mat-expansion-panel-header>
@@ -179,13 +189,15 @@ <h1>Frequently asked questions</h1>
           <li>
             Microsoft.
             <a
+              uiAnchor
+              scheme="url"
               href="https://www.microsoft.com/en-ca/security/mobile-authenticator-app"
               >https://www.microsoft.com/en-ca/security/mobile-authenticator-app</a
             >
           </li>
           <li>
             OneHealthID Service. Enrolment process tool FAQ at<br />
-            <a href="https://healthprovideridentityportal.gov.bc.ca/auth/login"
+            <a [href]="applicationUrl"
               >https://healthprovideridentityportal.gov.bc.ca/auth/login</a
             >
           </li>
@@ -194,6 +206,7 @@ <h1>Frequently asked questions</h1>
     </div>
     <div class="faq-item">
       <mat-expansion-panel
+        class="faq-expansion-panel"
         (opened)="panelOpenState.set(true)"
         (closed)="panelOpenState.set(false)">
         <mat-expansion-panel-header>
@@ -205,12 +218,13 @@ <h1>Frequently asked questions</h1>
         </mat-expansion-panel-header>
         <p>
           View instructions to setup Multi-factor authentication
-          <a (click)="navigateToMfaPage()">here</a>.
+          <a class="mfa-link" (click)="navigateToMfaPage()">here</a>.
         </p>
       </mat-expansion-panel>
     </div>
     <div class="faq-item">
       <mat-expansion-panel
+        class="faq-expansion-panel"
         (opened)="panelOpenState.set(true)"
         (closed)="panelOpenState.set(false)">
         <mat-expansion-panel-header>
@@ -261,9 +275,7 @@ <h1>Frequently asked questions</h1>
     <div class="support-section">
       <div class="support-text">
         <h2>Still have questions?</h2>
-        <p class="email-text">
-          Choose a category to the right, and email us directly.
-        </p>
+        <p class="email-text">Choose a contact to email us directly.</p>
         <p class="additional-text">Additional support:</p>
         <p class="additional-text">
           <img
@@ -346,9 +358,12 @@ <h2>Still have questions?</h2>
   </section>
 
   <div class="back-to-top-container">
-    <button class="back-to-top" (click)="scrollToTop()" *ngIf="showBackToTopButton">
+    <button
+      *ngIf="showBackToTopButton"
+      class="back-to-top"
+      (click)="scrollToTop()">
       <fa-icon [icon]="faArrowUp"></fa-icon>
     </button>
-    <div class="back-to-top-text" *ngIf="showBackToTopButton">Back to top</div>
+    <div *ngIf="showBackToTopButton" class="back-to-top-text">Back to top</div>
   </div>
 </div>
diff --git a/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.scss b/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.scss
index 612b05632..d826b68e4 100644
--- a/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.scss
+++ b/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.scss
@@ -36,43 +36,25 @@
       font-weight: 700;
     }
 
+    .mfa-link {
+      cursor: pointer;
+    }
+
     .faq-item {
-      border-bottom: 1px solid #CCC;
+      border-bottom: 1px solid #ccc;
       margin-bottom: 10px;
 
       a {
         color: #0d6efd;
         text-decoration: underline;
       }
-
-      ::ng-deep .mat-expansion-panel {
-        box-shadow: none;
-
-        .mat-expansion-panel-header {
-          padding: 0;
-          line-height: 1.5;
-        }
-
-        .mat-expansion-indicator,
-        .mat-expansion-indicator::after {
-          border-width: 0 3px 3px 0 !important;
-
-          &::after {
-            color: #CCCCCC;
-          }
-        }
-
-        .mat-expansion-panel-body {
-          padding: 0;
-          line-height: 1.5;
-        }
-
-      }
     }
 
     .footer-cards {
       display: grid;
-      grid-template-columns: calc(49% - 15px) calc(17% - 15px) calc(17% - 15px) calc(17% - 15px);
+      grid-template-columns: calc(49% - 15px) calc(17% - 15px) calc(17% - 15px) calc(
+          17% - 15px
+        );
       gap: 20px;
       margin-top: 2rem;
 
@@ -95,9 +77,8 @@
           flex-direction: column;
           align-items: flex-start;
           gap: 5px;
-          border: 1px solid #CCC;
-          background: #F2F2F2;
-
+          border: 1px solid #ccc;
+          background: #f2f2f2;
 
           h2 {
             color: #036;
@@ -140,15 +121,15 @@
           display: flex;
           flex-direction: column;
           width: 100%;
-          justify-content: start;
+          justify-content: flex-start;
           align-items: center;
           text-align: center;
           height: 11rem;
           padding: 2rem 1rem;
           border-radius: 4px;
           transition: background-color 0.3s ease;
-          border: 1px solid #CCC;
-          background: #FFF;
+          border: 1px solid #ccc;
+          background: #fff;
           box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
           color: var(--BC-gov-blue, #036);
           font-size: 0.8rem;
@@ -174,25 +155,24 @@
   }
 
   .back-to-top {
-    background-color: #38598A;
-    color: #FFFFFF;
-    width: 40PX;
-    height: 40PX;
+    background-color: #38598a;
+    color: #ffffff;
+    width: 40px;
+    height: 40px;
     border-radius: 50%;
     text-align: center;
     cursor: pointer;
   }
 
   .back-to-top-text {
-    color: #38598A;
+    color: #38598a;
     font-size: 13px;
-    word-wrap: break-word
+    word-wrap: break-word;
   }
 
   .back-to-top:hover {
     background-color: #003366;
   }
-
 }
 
 .viewport-medium {
@@ -212,35 +192,6 @@
 
     .faq-item {
       margin-bottom: 20px;
-
-      ::ng-deep .mat-expansion-panel {
-
-        .mat-expansion-panel-header {
-          font-size: 0.75rem;
-          height: auto;
-        }
-
-        .mat-expansion-panel-header-title {
-          margin-right: 2px;
-        }
-
-        .mat-expansion-indicator,
-        .mat-expansion-indicator::after {
-          border-width: 0 2px 2px 0 !important;
-          padding: 3px !important;
-          margin-bottom: 5px;
-
-        }
-
-        .mat-expansion-panel-body {
-
-          p:first-of-type {
-            padding-top: 5px;
-          }
-
-          font-size: 0.75rem;
-        }
-      }
     }
 
     .footer-cards {
@@ -257,9 +208,8 @@
           flex-direction: column;
           align-items: flex-start;
           gap: 5px;
-          border: 1px solid #CCC;
-          background: #F2F2F2;
-
+          border: 1px solid #ccc;
+          background: #f2f2f2;
 
           h2 {
             font-size: 30px;
@@ -296,8 +246,8 @@
   }
 
   .back-to-top {
-    width: 30PX;
-    height: 30PX;
+    width: 30px;
+    height: 30px;
   }
 
   .back-to-top-text {
@@ -309,12 +259,10 @@
   }
 }
 
-
-
 .viewport-small {
   .back-to-top {
-    width: 30PX;
-    height: 30PX;
+    width: 30px;
+    height: 30px;
   }
 
   .back-to-top-text {
diff --git a/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.ts b/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.ts
index dc02ed3b5..554829126 100644
--- a/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.ts
+++ b/workspace/apps/pidp/src/app/features/faq/pages/help/help.page.ts
@@ -1,9 +1,13 @@
+import { NgIf } from '@angular/common';
 import { Component, HostListener, Inject, OnInit, signal } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
+import { MatExpansionModule } from '@angular/material/expansion';
 import { ActivatedRoute, Router } from '@angular/router';
-import {MatExpansionModule} from '@angular/material/expansion';
-import { InjectViewportCssClassDirective } from '@bcgov/shared/ui';
 
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { faAngleRight, faArrowUp } from '@fortawesome/free-solid-svg-icons';
+
+import { InjectViewportCssClassDirective } from '@bcgov/shared/ui';
 import {
   AnchorDirective,
   PageComponent,
@@ -16,11 +20,9 @@ import {
 
 import { APP_CONFIG, AppConfig } from '@app/app.config';
 import { UtilsService } from '@app/core/services/utils.service';
-import { faAngleRight, faArrowUp } from '@fortawesome/free-solid-svg-icons';
-import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { FaqRoutes } from '../../faq.routes';
 import { Constants } from '@app/shared/constants';
-import { NgIf } from '@angular/common';
+
+import { FaqRoutes } from '../../faq.routes';
 
 @Component({
   selector: 'app-help',
@@ -48,6 +50,7 @@ export class HelpPage implements OnInit {
   public showBackToTopButton: boolean = false;
   public faArrowUp = faArrowUp;
   public faAngleRight = faAngleRight;
+  public applicationUrl: string;
 
   public constructor(
     @Inject(APP_CONFIG) private config: AppConfig,
@@ -56,17 +59,22 @@ export class HelpPage implements OnInit {
     private utilsService: UtilsService,
   ) {
     this.providerIdentitySupport = this.config.emails.providerIdentitySupport;
+    this.applicationUrl = this.config.applicationUrl;
   }
 
   @HostListener('window:scroll', [])
   public onWindowScroll(): void {
-     const scrollPosition = window.scrollY || document.documentElement.scrollTop || document.body.scrollTop || 0;
-     this.showBackToTopButton = scrollPosition > Constants.scrollThreshold;
-   }
+    const scrollPosition =
+      window.scrollY ||
+      document.documentElement.scrollTop ||
+      document.body.scrollTop ||
+      0;
+    this.showBackToTopButton = scrollPosition > Constants.scrollThreshold;
+  }
 
- public  scrollToTop(): void {
-  window.scrollTo({ top: 0, behavior: 'smooth' });
-}
+  public scrollToTop(): void {
+    window.scrollTo({ top: 0, behavior: 'smooth' });
+  }
 
   public onBack(): void {
     this.navigateToRoot();
diff --git a/workspace/apps/pidp/src/app/features/faq/pages/mfa-setup/mfa-setup-routing.routes.ts b/workspace/apps/pidp/src/app/features/faq/pages/mfa-setup/mfa-setup-routing.routes.ts
index f8f4218e1..403275ce8 100644
--- a/workspace/apps/pidp/src/app/features/faq/pages/mfa-setup/mfa-setup-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/faq/pages/mfa-setup/mfa-setup-routing.routes.ts
@@ -1,24 +1,16 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { MfaSetupPage } from './mfa-setup.page';
 
 export const routes: Routes = [
   {
     path: '',
     component: MfaSetupPage,
-    canActivate: [setDashboardTitleGuard],
     data: {
       title: 'OneHealthID Service',
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/history/pages/signed-or-accepted-documents/signed-or-accepted-documents-routing.routes.ts b/workspace/apps/pidp/src/app/features/history/pages/signed-or-accepted-documents/signed-or-accepted-documents-routing.routes.ts
index 4a2623f0e..a7bfc953f 100644
--- a/workspace/apps/pidp/src/app/features/history/pages/signed-or-accepted-documents/signed-or-accepted-documents-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/history/pages/signed-or-accepted-documents/signed-or-accepted-documents-routing.routes.ts
@@ -1,24 +1,16 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { SignedOrAcceptedDocumentsPage } from './signed-or-accepted-documents.page';
 
 export const routes: Routes = [
   {
     path: '',
     component: SignedOrAcceptedDocumentsPage,
-    canActivate: [setDashboardTitleGuard],
     data: {
       title: 'OneHealthID Service',
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/history/pages/transactions/transactions-routing.routes.ts b/workspace/apps/pidp/src/app/features/history/pages/transactions/transactions-routing.routes.ts
index 513a94841..668189979 100644
--- a/workspace/apps/pidp/src/app/features/history/pages/transactions/transactions-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/history/pages/transactions/transactions-routing.routes.ts
@@ -1,24 +1,16 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { TransactionsPage } from './transactions.page';
 
 export const routes: Routes = [
   {
     path: '',
     component: TransactionsPage,
-    canActivate: [setDashboardTitleGuard],
     data: {
       title: 'OneHealthID Service',
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/history/pages/view-document/view-document-routing.routes.ts b/workspace/apps/pidp/src/app/features/history/pages/view-document/view-document-routing.routes.ts
index 3745c5dd8..0bc4b37e1 100644
--- a/workspace/apps/pidp/src/app/features/history/pages/view-document/view-document-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/history/pages/view-document/view-document-routing.routes.ts
@@ -1,21 +1,13 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { ViewDocumentPage } from './view-document.page';
 
 export const routes: Routes = [
   {
     path: '',
     component: ViewDocumentPage,
-    canActivate: [setDashboardTitleGuard],
     data: {
       title: 'OneHealthID Service',
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/components/endorsement-card/endorsement-card.component.html b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/components/endorsement-card/endorsement-card.component.html
index cc26f0437..f4b341fdd 100644
--- a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/components/endorsement-card/endorsement-card.component.html
+++ b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/components/endorsement-card/endorsement-card.component.html
@@ -1,47 +1,25 @@
 <section class="box" uiPidpInjectViewportCss>
   <div class="content">
     <div class="icon-box">
-      <mat-icon class="material-icons-outlined">account_circle</mat-icon>
+      <img src="/assets/images/icons/account-image.svg" alt="Account Icon" />
     </div>
-    <div class="spacer-left"></div>
     <div class="name-box">
       <h3 class="name">{{ nameText }}</h3>
     </div>
+  </div>
+  <div class="second-row">
     <div class="school-box">
-      <span>{{ collegeText }}</span>
+      <p *ngIf="collegeText">
+        <span>{{ collegeText }}</span>
+      </p>
     </div>
     <div class="extra-box-large">
-      <div
-        *ngIf="noticeText"
-        class="notice-box"
-        [class.notice-green]="noticeColour === 'green'"
-        [class.notice-yellow]="noticeColour === 'yellow'"
-        [class.notice-red]="noticeColour === 'red'">
-        <span>{{ noticeText }}</span>
-      </div>
-      <div *ngIf="createdOnText" class="created-box">
-        <span>{{ createdOnText }}</span>
-      </div>
-    </div>
-    <div
-      *ngIf="showMobileNoticeIcon || !!createdOnText"
-      class="extra-box-xsmall">
-      <fa-icon
-        *ngIf="showMobileNoticeIcon"
-        [class.notice-green]="noticeColour === 'green'"
-        [class.notice-yellow]="noticeColour === 'yellow'"
-        [class.notice-red]="noticeColour === 'red'"
-        [icon]="faUserGroup"></fa-icon>
-      <span
-        *ngIf="createdOnText"
-        [class.notice-green]="noticeColour === 'green'"
-        >{{ createdOnText }}</span
-      >
-      <span *ngIf="showMobileNoticeText"
-      [class.notice-yellow]="noticeColour === 'yellow'"
-      [class.notice-red]="noticeColour === 'red'">
-        {{ noticeText }}
-      </span>
+      <p *ngIf="noticeText">
+        <span>Status: {{ noticeText }}</span>
+      </p>
+      <p *ngIf="createdOnText">
+        <span>Label: {{ createdOnText }}</span>
+      </p>
     </div>
   </div>
   <div *ngIf="isCancelEnabled || isApproveEnabled" class="actions">
diff --git a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/components/endorsement-card/endorsement-card.component.scss b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/components/endorsement-card/endorsement-card.component.scss
index c9e8e9241..d15a6881c 100644
--- a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/components/endorsement-card/endorsement-card.component.scss
+++ b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/components/endorsement-card/endorsement-card.component.scss
@@ -29,24 +29,36 @@ p {
   justify-content: space-between;
   border: solid 1px pidp.$grey-30;
   border-radius: 4px;
+  max-width: 23.3125rem;
+  padding: 1.25rem;
+  height: 100%;
+
   & .content {
     margin-bottom: var(--gap);
     & .icon-box {
       padding: 0 var(--gap);
-      & mat-icon {
-        font-size: var(--icon-font-size);
-        height: var(--icon-font-size);
-        width: var(--icon-font-size);
-      }
+      border: 2px solid #fcba19;
+      border-radius: 50%;
+      width: 3.75rem;
+      height: 3.75rem;
+      margin-right: 1rem;
     }
     & h3 {
       margin: var(--gap) var(--gap) var(--gap) 0;
-      font-size: 1.25rem;
+      color: #036;
+      font-size: 1.125rem;
+      font-weight: 700;
       // Ensure long email addresses will wrap instead of making the card wider.
       word-break: break-all;
     }
+  }
+  & .second-row {
+    margin-bottom: 1.75rem;
     & .school-box {
-      padding-right: var(--gap);
+      color: #313132;
+      font-size: 1rem;
+      font-weight: 400;
+      line-height: 1.2rem;
     }
     & .extra-box-large {
       & .notice-box {
@@ -88,23 +100,27 @@ p {
     }
   }
   & .actions {
-    padding: 0 var(--gap) var(--gap);
     display: flex;
     justify-content: space-between;
 
-    & button.cancel {
-      border-color: pidp.$bcgov-color-primary;
-    }
+    & button.cancel,
     & button.approve {
-      color: #fff;
-      border-color: pidp.$green;
-      background-color: pidp.$green;
+      color: #036;
+      gap: var(--gap);
+      border-radius: 0.25rem;
+      border: 2px solid #036;
+      background: #fff;
+      max-width: 8.25rem;
+      font-size: 1rem;
+      font-weight: 700;
+      letter-spacing: 0.0625rem;
     }
   }
 }
 
 // mobile layout
 .viewport-xsmall {
+  max-width: 25.3125rem;
   & .content {
     display: grid;
     grid-template-columns: auto 1fr;
diff --git a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements-routing.routes.ts b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements-routing.routes.ts
index da4ed1a54..e6a9ec748 100644
--- a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { highAssuranceCredentialGuard } from '@app/features/auth/guards/high-assurance-credential.guard';
 
 import { EndorsementsPage } from './endorsements.page';
@@ -10,12 +8,6 @@ export const routes: Routes = [
   {
     path: '',
     component: EndorsementsPage,
-    canActivate: [setDashboardTitleGuard, highAssuranceCredentialGuard],
-    data: {
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to your endorsements',
-        titleDescriptionText: '',
-      },
-    },
+    canActivate: [highAssuranceCredentialGuard],
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.html b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.html
index 484000130..75ee5b31f 100644
--- a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.html
+++ b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.html
@@ -1,9 +1,17 @@
 <form [formGroup]="formState.form" (submit)="onSubmit()">
-  <div class="box container" uiPidpInjectViewportCss>
+  <div class="container" uiPidpInjectViewportCss>
+    <nav class="breadcrumb">
+      <ul>
+        <li><a (click)="onBack()">Home</a></li>
+        <li><fa-icon class="fa-duotone" [icon]="faAngleRight"></fa-icon></li>
+        <li><a class="active">Active Page</a></li>
+      </ul>
+    </nav>
     <div class="content">
       <section class="care-team">
         <header>
-          <h2>Team Members</h2>
+          <h3>TEAM MEMBERS</h3>
+          <h1>Endorsements</h1>
         </header>
         <div class="care-team-text">
           <p class="large">
@@ -21,7 +29,7 @@ <h2>Team Members</h2>
             access. In the future, licensed health care providers will be able
             to pick which systems to endorse (if any).
           </p>
-          <p>To send a OneHealthID access invitation:</p>
+          <p><b>To send a OneHealthID access invitation:</b></p>
           <ol>
             <li>
               Send your colleague a OneHealthID access invitation by email below
@@ -31,7 +39,7 @@ <h2>Team Members</h2>
               vouched for by you, allowing them to register for OneHealthID
             </li>
           </ol>
-          <p>To endorse a OneHealthID access invitation:</p>
+          <p><b>To endorse a OneHealthID access invitation:</b></p>
           <ol>
             <li>
               You may also see an Incoming Request to vouch for a colleague who
@@ -146,7 +154,8 @@ <h2>Team Members</h2>
       </section>
       <section class="endorsement-request">
         <header>
-          <h2>Endorsement Request</h2>
+          <h3>PROCEDURE</h3>
+          <h1>Endorsement Request</h1>
         </header>
         <p>
           Enter the email of the person that you have a working relationship
@@ -159,10 +168,8 @@ <h2>Endorsement Request</h2>
           restart the process.
         </p>
         <mat-form-field>
-          <input
-            matInput
-            placeholder="Email"
-            formControlName="recipientEmail" />
+          <mat-label>Email</mat-label>
+          <input matInput formControlName="recipientEmail" />
           <mat-error *ngIf="recipientEmail.hasError('required')"
             >Required</mat-error
           >
diff --git a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.scss b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.scss
index c1af1cc09..21e2312d0 100644
--- a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.scss
+++ b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.scss
@@ -1,9 +1,6 @@
 @use 'pidp-variables' as pidp;
 @import 'bootstrap/bootstrap-imports';
 
-* {
-  box-sizing: border-box;
-}
 h2,
 label,
 p {
@@ -11,13 +8,11 @@ p {
 }
 
 // Set gap depending on viewport.
-.viewport-xsmall {
-  --gap: 1rem;
-}
+.viewport-xsmall,
 .viewport-large,
 .viewport-medium,
 .viewport-small {
-  --gap: 1.25rem;
+  --gap: 1rem;
 }
 
 // Use gap to set css.
@@ -25,47 +20,52 @@ p {
   --box-padding: 0;
   --content-padding: 0 0 var(--gap);
   --care-team-text-padding: var(--gap) var(--gap) 0;
-  --tab-content-flex-direction: column;
+  --tab-content-flex-direction: row;
   --endorsement-request-item-padding: 0 var(--gap);
-  --endorsement-form-field-width: 100%;
+  --endorsement-form-field-width: 38.375rem;
   padding: 1.25rem 0.75rem;
-}
-.viewport-large {
-  --box-padding: calc(2 * var(--gap)) 0;
-  --content-padding: 0;
-  --care-team-text-padding: var(--gap) 0;
-  --tab-content-flex-direction: unset;
-  --endorsement-request-item-padding: unset;
-  --endorsement-form-field-width: 30rem;
-}
-.viewport-medium {
-  --box-padding: var(--gap) 0;
-  --content-padding: 0;
-  --care-team-text-padding: var(--gap) 0;
-  --tab-content-flex-direction: unset;
-  --endorsement-request-item-padding: unset;
-  --endorsement-form-field-width: 30rem;
-}
-.viewport-small {
-  --box-padding: 0 0 var(--gap);
-  --content-padding: 0 var(--gap);
-  --care-team-text-padding: var(--gap) 0;
-  --tab-content-flex-direction: unset;
-  --endorsement-request-item-padding: unset;
-  --endorsement-form-field-width: 30rem;
-}
-.viewport-all {
-  padding: var(--box-padding);
+
+  .breadcrumb ul {
+    list-style: none;
+    top: 0;
+    right: 0;
+    padding: 0px;
+  }
+
+  .breadcrumb fa-icon {
+    height: 12px;
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+
+  .breadcrumb ul li {
+    display: inline;
+  }
+
+  .breadcrumb a,
+  .text-button {
+    text-decoration: none;
+    color: #1a5a96;
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 27px;
+    word-wrap: break-word;
+  }
+
   & .content {
     padding: var(--content-padding);
     & header {
-      display: flex;
-      align-items: center;
-      flex-wrap: nowrap;
-      padding: calc(var(--gap) / 2) var(--gap);
-      background-color: pidp.$page-header-background-color;
-      & h2 {
-        margin: 0;
+      & h3 {
+        color: #4493b5;
+        font-size: 1.5rem;
+        font-weight: 400;
+        margin-bottom: 0.5rem;
+      }
+      & h1 {
+        color: #036;
+        font-size: 3.125rem;
+        font-weight: 700;
+        margin-bottom: 0;
       }
       & mat-icon {
         margin-left: calc(var(--gap) / 2);
@@ -73,10 +73,11 @@ p {
     }
     & .care-team {
       & .care-team-text {
-        padding: var(--care-team-text-padding);
-        & .large {
-          font-size: 1.25rem;
-        }
+        padding: var(--care-team-text-padding) 0;
+        color: #313132;
+        font-size: 1rem;
+        font-weight: 400;
+        line-height: 1.6875rem;
       }
       & .care-team-tabs {
         min-height: 10rem;
@@ -85,6 +86,8 @@ p {
         display: flex;
         align-items: center;
         opacity: 1;
+        color: #000;
+        font-size: 1.125rem;
         & .badge {
           margin-left: 0.5rem;
           font-size: 0.5rem;
@@ -100,41 +103,128 @@ p {
       }
       & .tab-content {
         padding: var(--gap);
-        display: flex;
-        flex-wrap: wrap;
         gap: var(--gap);
-        flex-direction: var(--tab-content-flex-direction);
-
-        & .endorsement-card {
-          flex-basis: calc((100% - (var(--gap))) / 2);
-
-          @include media-breakpoint-up(lg) {
-            flex-basis: calc((100% - (var(--gap))) / 3);
-          }
-
-          display: flex;
-        }
+        display: grid;
+        grid-template-columns: calc(50% - 15px) calc(50% - 15px);
       }
     }
     & .endorsement-request {
       & header {
         margin: calc(2 * var(--gap)) 0 var(--gap);
       }
-      & p,
-      & h3 {
-        padding: var(--endorsement-request-item-padding);
-      }
       & mat-form-field {
-        padding: var(--endorsement-request-item-padding);
-        width: var(--endorsement-form-field-width);
+        max-width: var(--endorsement-form-field-width);
+        width: 100%;
       }
     }
     & .actions {
-      display: flex;
-      padding: var(--endorsement-request-item-padding);
+      margin-top: 2rem;
+      button {
+        border-radius: 0.25rem;
+        border: 2px solid #036;
+        font-size: 1rem;
+        font-weight: 700;
+        letter-spacing: 0.0625rem;
+      }
       & button:not(:first-of-type) {
         margin-left: var(--gap);
       }
     }
   }
 }
+.viewport-large {
+  --tab-content-flex-direction: row;
+  & .content {
+    & .care-team {
+      & .tab-content {
+        grid-template-columns: calc(33% - 15px) calc(33% - 15px) calc(
+            33% - 15px
+          );
+      }
+    }
+  }
+}
+
+.viewport-medium {
+  --tab-content-flex-direction: row;
+  & .content {
+    & .care-team {
+      & .tab-content {
+        grid-template-columns: calc(33% - 15px) calc(33% - 15px) calc(
+            33% - 15px
+          );
+      }
+    }
+  }
+}
+.viewport-small {
+  --gap: 1rem;
+  --font-size: 0.75rem;
+  --card-header-font-size: unset;
+  --card-header-line-height: unset;
+  --tab-content-flex-direction: column;
+  & .content {
+    & .care-team {
+      & .tab-label-box {
+        font-size: 1rem;
+      }
+      & .tab-content {
+        grid-template-columns: calc(50% - 15px) calc(50% - 15px);
+      }
+    }
+  }
+}
+.viewport-xsmall {
+  --gap: 1rem;
+  --font-size: 1rem;
+  --card-header-font-size: calc(2 * var(--font-size));
+  --card-header-line-height: calc(var(--card-header-font-size) + 0.5rem);
+  --margin-bottom-style: 1.5rem;
+  padding: 1.25rem 0;
+
+  .breadcrumb {
+    padding: 0 0.75rem;
+  }
+
+  & .content {
+    padding: var(--content-padding);
+    & header {
+      padding: 0 0.75rem;
+      & h3 {
+        color: #4493b5;
+        font-size: 1.2rem;
+        font-weight: 400;
+        margin-bottom: 0.5rem;
+      }
+      & h1 {
+        color: #036;
+        font-size: 2rem;
+        font-weight: 700;
+        margin-bottom: 0;
+      }
+    }
+    & .care-team {
+      & .care-team-text {
+        padding: 0 0.75rem;
+      }
+      & .tab-content {
+        grid-template-columns: 100%;
+      }
+    }
+
+    & .endorsement-request {
+      & header {
+        padding: 0 0.75rem;
+      }
+      p {
+        padding: 0 0.75rem;
+      }
+      & mat-form-field {
+        padding: 0 0.75rem;
+      }
+    }
+    & .actions {
+      padding: 0 0.75rem;
+    }
+  }
+}
diff --git a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.ts b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.ts
index 9a1436420..1eefe9b3b 100644
--- a/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.ts
+++ b/workspace/apps/pidp/src/app/features/organization-info/pages/endorsements/endorsements.page.ts
@@ -19,6 +19,7 @@ import {
   catchError,
   exhaustMap,
   map,
+  noop,
   of,
   switchMap,
   tap,
@@ -26,6 +27,7 @@ import {
 
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import {
+  faAngleRight,
   faArrowDown,
   faArrowUp,
   faUser,
@@ -105,6 +107,7 @@ export class EndorsementsPage
   public faUserGroup = faUserGroup;
   public faArrowUp = faArrowUp;
   public faArrowDown = faArrowDown;
+  public faAngleRight = faAngleRight;
 
   public formState: EndorsementsFormState;
   public completed: boolean | null;
@@ -140,6 +143,24 @@ export class EndorsementsPage
 
   public showTextLabels = false;
   public showIconLabels = true;
+  public popupData: DialogOptions = {
+    title: 'Endorsement requests',
+    bottomBorder: false,
+    titlePosition: 'center',
+    bodyTextPosition: 'center',
+    component: HtmlComponent,
+    data: {
+      content:
+        'You are about to <b>cancel</b> this endorsement, would you like to proceed',
+    },
+    imageSrc: '/assets/images/online-marketing-hIgeoQjS_iE-unsplash.jpg',
+    imageType: 'banner',
+    width: '31rem',
+    height: '24rem',
+    actionText: 'Continue',
+    actionTypePosition: 'center',
+    class: 'dialog-container',
+  };
 
   public get recipientEmail(): FormControl {
     return this.formState.form.get('recipientEmail') as FormControl;
@@ -161,38 +182,72 @@ export class EndorsementsPage
 
   public onApprove(requestId: number): void {
     this.loadingOverlayService.open(LOADING_OVERLAY_DEFAULT_MESSAGE);
-    this.resource
-      .approveEndorsementRequest(this.partyService.partyId, requestId)
+    const data: DialogOptions = this.popupData;
+
+    data.data = {
+      content:
+        'You are about to <b>approve</b> this endorsement, would you like to proceed',
+    };
+
+    this.dialog
+      .open(ConfirmDialogComponent, { data })
+      .afterClosed()
       .pipe(
-        switchMap(
-          () =>
-            (this.actionableEndorsementRequests$ =
-              this.getActionableEndorsementRequests(this.partyService.partyId)),
-        ),
+        exhaustMap((result) => {
+          this.loadingOverlayService.close();
+          return result
+            ? this.resource
+                .approveEndorsementRequest(this.partyService.partyId, requestId)
+                .pipe(
+                  switchMap(
+                    () =>
+                      (this.actionableEndorsementRequests$ =
+                        this.getActionableEndorsementRequests(
+                          this.partyService.partyId,
+                        )),
+                  ),
+                )
+            : EMPTY;
+        }),
       )
       .subscribe();
   }
 
   public onCancel(requestId: number): void {
-    this.resource
-      .declineEndorsementRequest(this.partyService.partyId, requestId)
+    const data: DialogOptions = this.popupData;
+    data.data = {
+      content:
+        'You are about to <b>cancel</b> this endorsement, would you like to proceed',
+    };
+    this.dialog
+      .open(ConfirmDialogComponent, { data })
+      .afterClosed()
       .pipe(
-        switchMap(
-          () =>
-            (this.actionableEndorsementRequests$ =
-              this.getActionableEndorsementRequests(this.partyService.partyId)),
-        ),
+        exhaustMap((result) => {
+          this.loadingOverlayService.close();
+          return result
+            ? this.resource
+                .declineEndorsementRequest(this.partyService.partyId, requestId)
+                .pipe(
+                  switchMap(
+                    () =>
+                      (this.actionableEndorsementRequests$ =
+                        this.getActionableEndorsementRequests(
+                          this.partyService.partyId,
+                        )),
+                  ),
+                )
+            : EMPTY;
+        }),
       )
       .subscribe();
   }
 
   public onCancelEndorsement(endorsementId: number): void {
-    const data: DialogOptions = {
-      title: 'Cancel Endorsement',
-      component: HtmlComponent,
-      data: {
-        content: 'Are you sure you want to cancel this Endorsement?',
-      },
+    const data: DialogOptions = this.popupData;
+    data.data = {
+      content:
+        'You are about to <b>cancel</b> this endorsement, would you like to proceed',
     };
     this.dialog
       .open(ConfirmDialogComponent, { data })
@@ -262,9 +317,49 @@ export class EndorsementsPage
 
   protected performSubmission(): NoContent {
     const partyId = this.partyService.partyId;
+    const data: DialogOptions = {
+      title: 'Endorsement requests',
+      bottomBorder: false,
+      titlePosition: 'center',
+      bodyTextPosition: 'center',
+      component: HtmlComponent,
+      data: {
+        content:
+          "You are about to <b>request</b> an endorsement to<p class='p-0 m-0' style='color: #036;font-size:1.2rem;'><b>" +
+          this.formState.json?.recipientEmail +
+          '</b></p>would you like to proceed?',
+      },
+      imageSrc: '/assets/images/online-marketing-hIgeoQjS_iE-unsplash.jpg',
+      imageType: 'banner',
+      width: '31rem',
+      height: '26rem',
+      actionText: 'Continue',
+      actionTypePosition: 'center',
+      class: 'dialog-container',
+    };
 
     return partyId && this.formState.json
-      ? this.resource.createEndorsementRequest(partyId, this.formState.json)
+      ? this.dialog
+          .open(ConfirmDialogComponent, { data })
+          .afterClosed()
+          .pipe(
+            exhaustMap((result) => {
+              this.loadingOverlayService.close();
+              return result && partyId && this.formState.json
+                ? this.resource.createEndorsementRequest(
+                    partyId,
+                    this.formState.json,
+                  )
+                : EMPTY;
+            }),
+            catchError((error: HttpErrorResponse) => {
+              this.loadingOverlayService.close();
+              if (error.status === HttpStatusCode.BadRequest) {
+                return of(noop());
+              }
+              return of(noop());
+            }),
+          )
       : EMPTY;
   }
 
diff --git a/workspace/libs/pidp/data-model/src/lib/models/state.model.ts b/workspace/apps/pidp/src/app/features/portal/models/state.model.ts
similarity index 88%
rename from workspace/libs/pidp/data-model/src/lib/models/state.model.ts
rename to workspace/apps/pidp/src/app/features/portal/models/state.model.ts
index 038cab86e..dbb8fd9ce 100644
--- a/workspace/libs/pidp/data-model/src/lib/models/state.model.ts
+++ b/workspace/apps/pidp/src/app/features/portal/models/state.model.ts
@@ -1,3 +1,5 @@
+import { AlertCode } from '../enums/alert-code.enum';
+
 export const PidpStateName = {
   dashboard: 'dashboard',
 };
@@ -10,6 +12,7 @@ export interface DashboardStateModel extends NamedState {
   userProfileFullNameText: string;
   userProfileCollegeNameText: string;
   collegeRoute: string;
+  alerts: AlertCode[];
 }
 export const defaultDashboardState: DashboardStateModel = {
   stateName: PidpStateName.dashboard,
@@ -18,6 +21,7 @@ export const defaultDashboardState: DashboardStateModel = {
   userProfileFullNameText: '',
   userProfileCollegeNameText: '',
   collegeRoute: '',
+  alerts: [],
 };
 export interface ApplicationStateModel {
   all: NamedState[];
diff --git a/workspace/apps/pidp/src/app/features/portal/portal-routing.routes.ts b/workspace/apps/pidp/src/app/features/portal/portal-routing.routes.ts
index 45bd88b12..3836cb5ee 100644
--- a/workspace/apps/pidp/src/app/features/portal/portal-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/portal/portal-routing.routes.ts
@@ -1,21 +1,13 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { PortalPage } from './portal.page';
 
 export const routes: Routes = [
   {
     path: '',
     component: PortalPage,
-    canActivate: [setDashboardTitleGuard],
     data: {
       title: 'OneHealthID Service',
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/portal/portal.page.html b/workspace/apps/pidp/src/app/features/portal/portal.page.html
index f928bc668..f963c7319 100644
--- a/workspace/apps/pidp/src/app/features/portal/portal.page.html
+++ b/workspace/apps/pidp/src/app/features/portal/portal.page.html
@@ -16,7 +16,8 @@ <h5>Welcome to the <span>OneHealthID</span> Service</h5>
         <div class="card-content">
           <p class="card-header">Linking Accounts</p>
           <p>Link different credentials together in OneHealthID</p>
-          <a (click)="navigateToAccountLinkingPage()">
+          <a
+            (click)="navigateTo(ProfileRoutes.routePath(ProfileRoutes.ACCOUNT_LINKING))">
             <fa-icon [icon]="faArrowRight"></fa-icon> READ MORE
           </a>
         </div>
@@ -30,7 +31,8 @@ <h5>Welcome to the <span>OneHealthID</span> Service</h5>
         <div class="card-content">
           <p class="card-header">Acquire Access</p>
           <p>Acquire healthcare system access for myself</p>
-          <a (click)="navigateToAccessPage()">
+          <a
+            (click)="navigateTo(AccessRoutes.routePath(AccessRoutes.ACCESS_REQUESTS))">
             <fa-icon [icon]="faArrowRight"></fa-icon> READ MORE
           </a>
         </div>
@@ -44,9 +46,21 @@ <h5>Welcome to the <span>OneHealthID</span> Service</h5>
         <div class="card-content">
           <p class="card-header">Grant Access</p>
           <p>Grant healthcare system access for others</p>
-          <a (click)="navigateToEndorsements()">
-            <fa-icon [icon]="faArrowRight"></fa-icon> READ MORE
-          </a>
+          <div class="card-footer">
+            <span class="content-with-alert"
+              ><fa-icon
+                *ngIf="alerts.includes(AlertCode.PENDING_ENDORSEMENT_REQUEST)"
+                class="fa-duotone"
+                [icon]="faBell"></fa-icon
+              ><a
+                (click)="navigateTo(OrganizationInfoRoutes.routePath(OrganizationInfoRoutes.ENDORSEMENTS))">
+                READ MORE
+              </a></span
+            ><a
+              (click)="navigateTo(OrganizationInfoRoutes.routePath(OrganizationInfoRoutes.ENDORSEMENTS))"
+              ><fa-icon [icon]="faArrowRight"></fa-icon
+            ></a>
+          </div>
         </div>
       </div>
     </div>
diff --git a/workspace/apps/pidp/src/app/features/portal/portal.page.scss b/workspace/apps/pidp/src/app/features/portal/portal.page.scss
index 256016350..8ee6101d9 100644
--- a/workspace/apps/pidp/src/app/features/portal/portal.page.scss
+++ b/workspace/apps/pidp/src/app/features/portal/portal.page.scss
@@ -143,6 +143,19 @@
   padding-right: 3px;
 }
 
+div.card-footer {
+  display: flex;
+  justify-content: space-between;
+  .content-with-alert {
+    display: flex;
+    align-items: center;
+    fa-icon {
+      color: red;
+      margin-right: 5px;
+    }
+  }
+}
+
 .back-to-top-container {
   position: fixed;
   bottom: 170px;
@@ -327,10 +340,6 @@
     text-decoration: none;
   }
 
-  .card-footer {
-    margin-top: 70%;
-    position: relative;
-  }
   .back-to-top-container {
     position: fixed;
     bottom: 100px;
diff --git a/workspace/apps/pidp/src/app/features/portal/portal.page.spec.ts b/workspace/apps/pidp/src/app/features/portal/portal.page.spec.ts
index 1560239f8..09298bb9c 100644
--- a/workspace/apps/pidp/src/app/features/portal/portal.page.spec.ts
+++ b/workspace/apps/pidp/src/app/features/portal/portal.page.spec.ts
@@ -1,31 +1,32 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { HttpClient } from '@angular/common/http';
+import { TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
+import { provideAutoSpy } from 'jest-auto-spies';
+
 import { APP_CONFIG, APP_DI_CONFIG } from '@app/app.config';
+
 import { PortalPage } from './portal.page';
 
 describe('PortalPage', () => {
   let component: PortalPage;
-  let fixture: ComponentFixture<PortalPage>;
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [PortalPage, NoopAnimationsModule],
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [NoopAnimationsModule],
       providers: [
+        PortalPage,
         {
           provide: APP_CONFIG,
           useValue: APP_DI_CONFIG,
         },
+        provideAutoSpy(HttpClient),
       ],
-    }).compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PortalPage);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
+    });
+    component = TestBed.inject(PortalPage);
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
-});
\ No newline at end of file
+});
diff --git a/workspace/apps/pidp/src/app/features/portal/portal.page.ts b/workspace/apps/pidp/src/app/features/portal/portal.page.ts
index 056906c1e..61b2de425 100644
--- a/workspace/apps/pidp/src/app/features/portal/portal.page.ts
+++ b/workspace/apps/pidp/src/app/features/portal/portal.page.ts
@@ -1,18 +1,24 @@
 import { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper';
 import { NgIf, NgOptimizedImage } from '@angular/common';
-import { Component, HostListener, Inject } from '@angular/core';
+import { Component, HostListener, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
+import { map } from 'rxjs';
+
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { faBell } from '@fortawesome/free-regular-svg-icons';
 import { faArrowRight, faArrowUp } from '@fortawesome/free-solid-svg-icons';
 
 import { InjectViewportCssClassDirective } from '@bcgov/shared/ui';
 
-import { APP_CONFIG, AppConfig } from '@app/app.config';
+import { PartyService } from '@app/core/party/party.service';
 
 import { AccessRoutes } from '../access/access.routes';
 import { OrganizationInfoRoutes } from '../organization-info/organization-info.routes';
 import { ProfileRoutes } from '../profile/profile.routes';
+import { AlertCode } from './enums/alert-code.enum';
+import { ProfileStatus } from './models/profile-status.model';
+import { PortalResource } from './portal-resource.service';
 
 @Component({
   selector: 'app-portal',
@@ -32,13 +38,20 @@ import { ProfileRoutes } from '../profile/profile.routes';
     NgOptimizedImage,
   ],
 })
-export class PortalPage {
+export class PortalPage implements OnInit {
   public faArrowRight = faArrowRight;
   public faArrowUp = faArrowUp;
   public showBackToTopButton: boolean = false;
+  public ProfileRoutes = ProfileRoutes;
+  public AccessRoutes = AccessRoutes;
+  public OrganizationInfoRoutes = OrganizationInfoRoutes;
+  public alerts: AlertCode[] = [];
+  public AlertCode = AlertCode;
+  public faBell = faBell;
 
   public constructor(
-    @Inject(APP_CONFIG) private config: AppConfig,
+    private partyService: PartyService,
+    private resource: PortalResource,
     private router: Router,
   ) {}
 
@@ -52,26 +65,25 @@ export class PortalPage {
     const scrollThreshold = 200;
     this.showBackToTopButton = scrollPosition > scrollThreshold;
   }
-  
+
   public scrollToTop(): void {
     window.scrollTo({ top: 0, behavior: 'smooth' });
   }
-  
-  public navigateToAccountLinkingPage(): void {
-    this.router.navigateByUrl(
-      ProfileRoutes.routePath(ProfileRoutes.ACCOUNT_LINKING),
-    );
-  }
 
-  public navigateToAccessPage(): void {
-    this.router.navigateByUrl(
-      AccessRoutes.routePath(AccessRoutes.ACCESS_REQUESTS),
-    );
+  public navigateTo(path: string): void {
+    this.router.navigateByUrl(path);
   }
 
-  public navigateToEndorsements(): void {
-    this.router.navigateByUrl(
-      OrganizationInfoRoutes.routePath(OrganizationInfoRoutes.ENDORSEMENTS),
-    );
+  public ngOnInit(): void {
+    const partyId = this.partyService.partyId;
+    this.resource
+      .getProfileStatus(partyId)
+      .pipe(
+        map(
+          (profileStatus: ProfileStatus | null) =>
+            (this.alerts = profileStatus?.alerts ?? []),
+        ),
+      )
+      .subscribe();
   }
 }
diff --git a/workspace/apps/pidp/src/app/features/portal/portal.service.ts b/workspace/apps/pidp/src/app/features/portal/portal.service.ts
index 255645715..4c691c2b8 100644
--- a/workspace/apps/pidp/src/app/features/portal/portal.service.ts
+++ b/workspace/apps/pidp/src/app/features/portal/portal.service.ts
@@ -50,6 +50,12 @@ export class PortalService {
    * in the portal.
    */
   private _alerts: ProfileStatusAlert[];
+  /**
+   * @description
+   * List of HTTP response controlled alert messages for display
+   * in the College licence information page.
+   */
+  private _licenceAlerts: ProfileStatusAlert[];
   /**
    * @description
    * Whether all profile information has been completed, and
@@ -67,6 +73,7 @@ export class PortalService {
     this.state$ = this._state$.asObservable();
     this.accessState$ = this._accessState$.asObservable();
     this._alerts = [];
+    this._licenceAlerts = [];
     this._completedProfile = false;
   }
 
@@ -77,6 +84,10 @@ export class PortalService {
     return this._alerts;
   }
 
+  public get licenceAlerts(): ProfileStatusAlert[] {
+    return this._licenceAlerts;
+  }
+
   public get hiddenSections(): PortalSectionStatusKey[] {
     const status = this._profileStatus?.status;
 
@@ -97,6 +108,7 @@ export class PortalService {
     }
     this._profileStatus = profileStatus;
     this._alerts = this.getAlerts(profileStatus);
+    this._licenceAlerts = this.getLicenceAlerts(profileStatus);
     this._completedProfile = this.hasCompletedProfile(profileStatus);
 
     const builder = new PortalStateBuilder(
@@ -115,6 +127,12 @@ export class PortalService {
     this.pasPanelExpanded$.next(expanded);
   }
 
+  private getLicenceAlerts(profileStatus: ProfileStatus): ProfileStatusAlert[] {
+    return this.getAlerts(profileStatus).filter(
+      (alert) => alert.content !== PendingEndorsementComponent,
+    ) as ProfileStatusAlert[];
+  }
+
   private getAlerts(profileStatus: ProfileStatus): ProfileStatusAlert[] {
     return profileStatus.alerts.map((alert) => {
       switch (alert) {
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking-routing.routes.ts b/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking-routing.routes.ts
index 2bf34e59d..bbefe2c95 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { AccountLinkingPage } from './account-linking.page';
 import { accountLinkingResolver } from './account-linking.resolver';
 
@@ -9,7 +7,6 @@ export const routes: Routes = [
   {
     path: '',
     component: AccountLinkingPage,
-    canActivate: [setDashboardTitleGuard],
     resolve: {
       accountLinkingStatusCode: accountLinkingResolver,
     },
@@ -18,11 +15,6 @@ export const routes: Routes = [
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking.page.scss b/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking.page.scss
index 293cd2edf..a6ed3b55c 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking.page.scss
+++ b/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking.page.scss
@@ -683,9 +683,3 @@ div.viewport-large {
     }
   }
 }
-
-::ng-deep .dialog-container {
-  mat-dialog-container {
-    padding: 0.5rem;
-  }
-}
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking.page.ts b/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking.page.ts
index f8e9abf77..1f02ad69c 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking.page.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/account-linking/account-linking.page.ts
@@ -131,7 +131,7 @@ export class AccountLinkingPage implements OnInit, OnDestroy {
       height: '24rem',
       actionText: 'Continue',
       actionTypePosition: 'center',
-      class: 'dialog-container',
+      class: 'dialog-container dialog-padding',
     };
     this.dialog
       .open(ConfirmDialogComponent, { data })
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-declaration/college-licence-declaration-routing.routes.ts b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-declaration/college-licence-declaration-routing.routes.ts
index ca473d959..c68ec7a98 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-declaration/college-licence-declaration-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-declaration/college-licence-declaration-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { canDeactivateFormGuard } from '@app/core/guards/can-deactivate-form.guard';
 import { highAssuranceCredentialGuard } from '@app/features/auth/guards/high-assurance-credential.guard';
 import { collegeLicenceCompletedResolver } from '@app/features/auth/resolvers/college-licence-completed.resolver';
@@ -12,7 +10,7 @@ export const routes: Routes = [
   {
     path: '',
     component: CollegeLicenceDeclarationPage,
-    canActivate: [setDashboardTitleGuard, highAssuranceCredentialGuard],
+    canActivate: [highAssuranceCredentialGuard],
     canDeactivate: [canDeactivateFormGuard],
     resolve: {
       hasCompletedDeclaration: collegeLicenceCompletedResolver,
@@ -22,11 +20,6 @@ export const routes: Routes = [
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'College Licence Information',
-        titleDescriptionText:
-          'Provide the following information to complete your Provider Identity Profile',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-declaration/college-licence-declaration.page.ts b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-declaration/college-licence-declaration.page.ts
index 7814245f1..1715fade1 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-declaration/college-licence-declaration.page.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-declaration/college-licence-declaration.page.ts
@@ -11,9 +11,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 
 import { EMPTY, Observable, catchError, of, tap } from 'rxjs';
 
-import { DashboardStateModel, PidpStateName } from '@pidp/data-model';
 import { RegisteredCollege } from '@pidp/data-model';
-import { AppStateService } from '@pidp/presentation';
 
 import {
   AlertComponent,
@@ -28,7 +26,12 @@ import {
 } from '@app/core/classes/abstract-form-page.class';
 import { PartyService } from '@app/core/party/party.service';
 import { LoggerService } from '@app/core/services/logger.service';
+import {
+  DashboardStateModel,
+  PidpStateName,
+} from '@app/features/portal/models/state.model';
 import { ProfileRoutes } from '@app/features/profile/profile.routes';
+import { AppStateService } from '@app/features/shell/services/app-state.service';
 import { LookupService } from '@app/modules/lookup/lookup.service';
 import { CollegeLookup } from '@app/modules/lookup/lookup.types';
 
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information-routing.routes.ts b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information-routing.routes.ts
index 214c40aef..f05ebdeac 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { highAssuranceCredentialGuard } from '@app/features/auth/guards/high-assurance-credential.guard';
 import { collegeLicenceInfoResolver } from '@app/features/auth/resolvers/college-licence-info.resolver';
 
@@ -14,17 +12,12 @@ export const routes: Routes = [
     resolve: {
       hasCpn: collegeLicenceInfoResolver,
     },
-    canActivate: [setDashboardTitleGuard, highAssuranceCredentialGuard],
+    canActivate: [highAssuranceCredentialGuard],
     data: {
       title: 'OneHealthID Service',
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.html b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.html
index ca7d657c5..e96315eec 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.html
+++ b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.html
@@ -1,4 +1,9 @@
 <section class="component-container container" uiPidpInjectViewportCss>
+  <section *ngFor="let alert of alerts" class="alert-box section-box">
+    <app-portal-alert
+      [heading]="alert.heading"
+      [content]="alert.content"></app-portal-alert>
+  </section>
   <h2 class="header">All licence information found in our records</h2>
   <div class="info-box">
     <p class="info-here">
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.spec.ts b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.spec.ts
index f450c748d..a6531d6e7 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.spec.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.spec.ts
@@ -8,6 +8,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { randTextRange } from '@ngneat/falso';
 import { createSpyFromClass, provideAutoSpy } from 'jest-auto-spies';
+import { KeycloakService } from 'keycloak-angular';
 
 import { APP_CONFIG, APP_DI_CONFIG } from '@app/app.config';
 import { PartyService } from '@app/core/party/party.service';
@@ -61,6 +62,7 @@ describe('CollegeLicenceInformationPage', () => {
         provideAutoSpy(Router),
         provideAutoSpy(LoggerService),
         provideAutoSpy(CollegeLicenceInformationResource),
+        provideAutoSpy(KeycloakService),
       ],
     });
     router = TestBed.inject(Router);
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.ts b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.ts
index fcd377f6d..f72a3e9d3 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/college-licence/college-licence-information/college-licence-information.page.ts
@@ -4,7 +4,7 @@ import { Component, OnInit } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { Observable, catchError, map, of } from 'rxjs';
+import { Observable, catchError, map, of, tap } from 'rxjs';
 
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { faStethoscope } from '@fortawesome/free-solid-svg-icons';
@@ -13,6 +13,11 @@ import { InjectViewportCssClassDirective } from '@bcgov/shared/ui';
 
 import { PartyService } from '@app/core/party/party.service';
 import { LoggerService } from '@app/core/services/logger.service';
+import { PortalAlertComponent } from '@app/features/portal/components/portal-alert/portal-alert.component';
+import { ProfileStatusAlert } from '@app/features/portal/models/profile-status-alert.model';
+import { ProfileStatus } from '@app/features/portal/models/profile-status.model';
+import { PortalResource } from '@app/features/portal/portal-resource.service';
+import { PortalService } from '@app/features/portal/portal.service';
 
 import { CollegeCertification } from '../college-licence-declaration/college-certification.model';
 import { CollegeLicenceInformationResource } from './college-licence-information-resource.service';
@@ -30,6 +35,7 @@ import { CollegeLicenceInformationDetailComponent } from './components/college-l
     InjectViewportCssClassDirective,
     MatButtonModule,
     NgFor,
+    PortalAlertComponent,
   ],
 })
 export class CollegeLicenceInformationPage implements OnInit {
@@ -37,6 +43,7 @@ export class CollegeLicenceInformationPage implements OnInit {
 
   public title: string;
   public collegeCertifications$!: Observable<CollegeCertification[]>;
+  public alerts: ProfileStatusAlert[] = [];
 
   public constructor(
     private route: ActivatedRoute,
@@ -44,6 +51,8 @@ export class CollegeLicenceInformationPage implements OnInit {
     private partyService: PartyService,
     private resource: CollegeLicenceInformationResource,
     private logger: LoggerService,
+    private portalResource: PortalResource,
+    private portalService: PortalService,
   ) {
     this.title = this.route.snapshot.data.title;
   }
@@ -68,9 +77,25 @@ export class CollegeLicenceInformationPage implements OnInit {
         return of([]);
       }),
     );
+
+    const profileStatus$ = this.portalResource.getProfileStatus(
+      this.partyService.partyId,
+    );
+    this.updateAlerts(profileStatus$);
   }
 
   private navigateToRoot(): void {
     this.router.navigate([this.route.snapshot.data.routes.root]);
   }
+
+  private updateAlerts(profileStatus$: Observable<ProfileStatus | null>): void {
+    profileStatus$
+      .pipe(
+        tap((profileStatus: ProfileStatus | null) => {
+          this.portalService.updateState(profileStatus);
+          this.alerts = this.portalService.licenceAlerts;
+        }),
+      )
+      .subscribe();
+  }
 }
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/personal-information/personal-information-routing.routes.ts b/workspace/apps/pidp/src/app/features/profile/pages/personal-information/personal-information-routing.routes.ts
index 2bb374d35..9c9e15000 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/personal-information/personal-information-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/personal-information/personal-information-routing.routes.ts
@@ -1,7 +1,5 @@
 import { Routes } from '@angular/router';
 
-import { setDashboardTitleGuard } from '@pidp/presentation';
-
 import { canDeactivateFormGuard } from '@app/core/guards/can-deactivate-form.guard';
 
 import { PersonalInformationPage } from './personal-information.page';
@@ -10,18 +8,12 @@ export const routes: Routes = [
   {
     path: '',
     component: PersonalInformationPage,
-    canActivate: [setDashboardTitleGuard],
     canDeactivate: [canDeactivateFormGuard],
     data: {
       title: 'OneHealthID Service',
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.html b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.html
index e14fe247a..913c22598 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.html
+++ b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.html
@@ -1,184 +1,184 @@
-<ui-page-header class="section" icon="handshake" iconType="outlined">
-  <strong>Access Harmonization User Access Agreement</strong>
-</ui-page-header>
+<div class="container" uiPidpInjectViewportCss>
+  <div class="content-header">
+    <h1>Access harmonization user access agreement</h1>
+  </div>
 
-<ui-page-section>
-  <ui-page-subheader class="section"
-    ><strong>Background 1.0</strong></ui-page-subheader
-  >
-  <p class="section">
-    This Agreement is made between me and His Majesty the King in right of the
-    Province of British Columbia, as represented by the Minister of Health (the
-    “Province”), and describes the basic terms and conditions that I (the user)
-    must comply with in order to enroll for access to clinical health systems
-    available through the Province's OneHealthID Services ("OneHealthID").
-  </p>
+  <div class="page-sections">
+    <div class="main-container">
+      <section>
+        <h3 class="sub-header"><b>Background</b></h3>
+        <p class="body-text">
+          This Agreement is made between me and His Majesty the King in right of
+          the Province of British Columbia, as represented by the Minister of
+          Health (the “Province”) and describes the basic terms and conditions
+          that I (the user) must comply with in order to enroll for access to
+          clinical health systems available through the Province's OneHealthID
+          Services (“OneHealthID”).
+        </p>
 
-  <p class="section">
-    This Agreement does not guarantee access will be granted, System Owner(s)
-    may, at their discretion, amend or change the scope of my access privileges
-    to the System as privacy, security, business, and clinical practice
-    requirements change. In such circumstances, the System Owner will notify me
-    of such changes.
-  </p>
-</ui-page-section>
+        <p class="body-text">
+          This Agreement does not guarantee access will be granted, System
+          Owner(s) may, at their discretion, amend or change the scope of my
+          access privileges to the System as privacy, security, business, and
+          clinical practice requirements change. In such circumstances, the
+          System Owner will notify me of such changes.
+        </p>
+      </section>
 
-<ui-page-section>
-  <ui-page-subheader class="section"
-    ><strong>Definitions 2.0</strong></ui-page-subheader
-  >
+      <section>
+        <h3 class="sub-header"><b>User Access Agreement</b></h3>
+        <ul>
+          <li class="uaa-section">
+            <p class="body-text">
+              For Providers registered with a Professional College in BC:
+            </p>
 
-  <ul class="definitions">
-    <li class="uaa-section">
-      <strong>2.1</strong
-      ><span class="uaa-section-bullet"
-        ><strong>"Provider"</strong> means a person who practices a designated
-        health profession regulated by the
-        <em
-          >Health Professions Act and is in good standing with their
-          Professional College.</em
-        ></span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>2.2</strong
-      ><span class="uaa-section-bullet"
-        ><strong>"OneHealthID Services"</strong> means the Province's suite of
-        identity and access tools, including the platform where Providers and
-        Supervised users may apply for access to Systems.</span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>2.3</strong
-      ><span class="uaa-section-bullet"
-        ><strong>"Supervised User"</strong> means any member of a Provider's
-        staff who is required to access a System in relation to the Provider's
-        practice.</span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>2.4</strong
-      ><span class="uaa-section-bullet"
-        ><strong>"System"</strong> means the various provincial or private
-        computerized information systems available to access health information
-        in BC.</span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>2.5</strong
-      ><span class="uaa-section-bullet"
-        ><strong>"System Owner"</strong> means the Health Authority, Ministry or
-        organization responsible and accountable for data stored within a
-        System.</span
-      >
-    </li>
-  </ul>
-</ui-page-section>
+            <ol class="ordered-list">
+              <li>
+                <p class="body-text margin-left-2">
+                  I will only access the System(s) for so long as I am a
+                  registrant in good standing with my Professional College.
+                </p>
+              </li>
+            </ol>
+          </li>
+          <li class="uaa-section">
+            <p class="body-text">
+              For Supervised Users Accessing System(s) on behalf of a College
+              Registrant:
+            </p>
+            <ol class="ordered-list">
+              <li>
+                <p class="body-text margin-left-2">
+                  I will only access the System(s) for so long as I am accessing
+                  the System(s) on behalf of a Provider that meets the criteria
+                  above.
+                </p>
+              </li>
+            </ol>
+          </li>
+          <li class="uaa-section">
+            <p class="body-text">
+              I will only access the System(s) as necessary to perform my role
+              and duties, unless permitted by the System Owner(s).
+            </p>
+          </li>
+          <li class="uaa-section">
+            <p class="body-text">
+              I will cooperate with the execution of the System Owner's breach
+              management plan including responding, reporting and containing any
+              potential or known breach of personal information including any
+              unauthorized attempt, by any person, to access the System(s).
+            </p>
+          </li>
+        </ul>
+      </section>
 
-<ui-page-section>
-  <ui-page-subheader class="section"
-    ><strong>User Access Agreement 3.0</strong></ui-page-subheader
-  >
-  <ul class="uaa">
-    <li class="uaa-section">
-      <strong>3.1</strong
-      ><span class="uaa-section-bullet"
-        >For Providers registered with a Professional College in BC:<br /><span
-          class="uaa-section"
-          ><strong>a. </strong>
-          <p class="uaa-section-bullet-inside">
-            I will only access the System(s) for so long as I am a registrant in
-            good standing with my Professional College.
-          </p></span
-        ></span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>3.2</strong
-      ><span class="uaa-section-bullet"
-        >For Supervised Users Accessing System(s) on behalf of a College
-        Registrant:<br /><span class="uaa-section"
-          ><strong>a. </strong>
-          <p class="uaa-section-bullet-inside">
-            I will only access the System(s) for so long as I am accessing the
-            System(s) on behalf of a Provider that meets the criteria above.
-          </p></span
-        ></span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>3.3</strong
-      ><span class="uaa-section-bullet">
-        I will only access the System(s) as necessary to perform my role and
-        duties, unless permitted by the System Owner(s).</span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>3.4</strong
-      ><span class="uaa-section-bullet">
-        I will cooperate with the execution of the System Owner's breach
-        management plan including responding, reporting and containing any
-        potential or known breach of personal information including any
-        unauthorized attempt, by any person, to access the System(s).</span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>3.5</strong
-      ><span class="uaa-section-bullet"
-        >I will not permit any other person to access the System(s) with my
-        credentials and will take all reasonable measures to prevent
-        unauthorized access from occurring.</span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>3.6</strong
-      ><span class="uaa-section-bullet">
-        I will store all relevant System(s) data or personal information in
-        accordance with my or my supervising Provider's Professional College
-        Requirements and the System Owner's organizational policies.</span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>3.7</strong
-      ><span class="uaa-section-bullet">
-        I will ensure to the best of my ability that any personal information I
-        record in the System(s) about myself, or others is accurate, complete,
-        and up to date.</span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>3.8</strong
-      ><span class="uaa-section-bullet">
-        I will notify the System(s) Owner of any inaccuracy or errors.</span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>3.9</strong
-      ><span class="uaa-section-bullet">
-        I will cooperate with any IM/IT system audits and investigations
-        conducted by System Owners.</span
-      >
-    </li>
-    <li class="uaa-section">
-      <strong>3.10</strong
-      ><span class="uaa-section-bullet">
-        I acknowledge the System(s) Owner may report any material breach of this
-        Agreement to the Office of the Information and Privacy Commissioner of
-        British Columbia, and/or my organization/supervising Provider.</span
-      >
-    </li>
-  </ul>
+      <section>
+        <div class="body-grid-container">
+          <div class="first-row">
+            <div class="grid-column">
+              <p class="body-text">
+                I will not permit any other person to access the System(s) with
+                my credentials and will take all reasonable measures to prevent
+                unauthorized access from occurring.
+              </p>
+            </div>
+            <div class="grid-column">
+              <p class="body-text">
+                I will store all relevant System(s) data or personal information
+                in accordance with my or my supervising Provider's Professional
+                College Requirements and the System Owner's organizational
+                policies.
+              </p>
+            </div>
+          </div>
+          <div class="second-row">
+            <div class="grid-column">
+              <p class="body-text">
+                I will ensure to the best of my ability that any personal
+                information I record in the System(s) about myself, or others is
+                accurate, complete, and up to date.
+              </p>
 
-  <p class="section">
-    The terms and conditions of this Agreement may be amended by the Province at
-    any time, in its sole discretion, by the Province delivering written notice
-    of the amendment to the email address indicated in my OneHealthID profile.
-    Any such notice will specify the date upon which the amendment becomes
-    effective. If I continue to access any of the Systems enrolled through the
-    OneHealthID after the effective date of the amendment, I will be deemed to
-    have accepted the amendment. If I do not agree with an amendment for which
-    notice has been provided by the Province, I must promptly (and in any event
-    prior to the effective date) cease all access or use of all Systems enrolled
-    through the OneHealthID.
-  </p>
-</ui-page-section>
+              <p></p>
+            </div>
+            <div class="grid-column">
+              <p class="body-text">
+                I will notify the System(s) Owner of any inaccuracy or errors.
+              </p>
+            </div>
+          </div>
+        </div>
+
+        <p class="body-text">
+          I will cooperate with any IM/IT system audits and investigations
+          conducted by System Owners.
+        </p>
+        <p class="body-text">
+          I acknowledge the System(s) Owner may report any material breach of
+          this Agreement to the Office of the Information and Privacy
+          Commissioner of British Columbia, and/or my organization/supervising
+          Provider.
+        </p>
+
+        <p class="body-text">
+          The terms and conditions of this Agreement may be amended by the
+          Province at any time, in its sole discretion, by the Province
+          delivering written notice of the amendment to the email address
+          indicated in my OneHealthID profile. Any such notice will specify the
+          date upon which the amendment becomes effective. If I continue to
+          access any of the Systems enrolled through the OneHealthID after the
+          effective date of the amendment, I will be deemed to have accepted the
+          amendment. If I do not agree with an amendment for which notice has
+          been provided by the Province, I must promptly (and in any event prior
+          to the effective date) cease all access or use of all Systems enrolled
+          through the OneHealthID.
+        </p>
+      </section>
+    </div>
+
+    <div class="definitions-container">
+      <h3 class="sub-header">Definitions</h3>
+      <ul class="definitions">
+        <li class="uaa-section">
+          <h4 class="sidebar-header">Provider</h4>
+          <p class="sidebar-body">
+            means a person who practices a designated health profession
+            regulated by the Health Professions Act and is in good standing with
+            their Professional College.
+          </p>
+        </li>
+        <li class="uaa-section">
+          <h4 class="sidebar-header">OneHealthID Services</h4>
+          <p class="sidebar-body">
+            means the Province's suite of identity and access tools, including
+            the platform where Providers and Supervised users may apply for
+            access to Systems.
+          </p>
+        </li>
+        <li class="uaa-section">
+          <h4 class="sidebar-header">Supervised User</h4>
+          <p class="sidebar-body">
+            means any member of a Provider's staff who is required to access a
+            System in relation to the Provider's practice.
+          </p>
+        </li>
+        <li class="uaa-section">
+          <h4 class="sidebar-header">System</h4>
+          <p class="sidebar-body">
+            means the various provincial or private computerized information
+            systems available to access health information in BC.
+          </p>
+        </li>
+        <li class="uaa-section">
+          <h4 class="sidebar-header">System Owner</h4>
+          <p class="sidebar-body">
+            means the Health Authority, Ministry or organization responsible and
+            accountable for data stored within a System.
+          </p>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.scss b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.scss
index bec63b6e1..5f61d9ef4 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.scss
+++ b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.scss
@@ -1,6 +1,5 @@
-p,
-ul {
-  margin-bottom: 1.5rem;
+.viewport-all {
+  padding: 1.25rem 0.75rem 0 0.75rem;
 }
 
 ul {
@@ -9,30 +8,148 @@ ul {
   margin-left: 0;
 }
 
-.definitions li {
-  display: flex;
-  margin-bottom: 1rem;
-}
+.viewport-all {
+  .content-header h1 {
+    color: #003366;
+    font-size: 50px;
+    font-weight: 700;
+    word-wrap: break-word;
+  }
+
+  .page-sections {
+    display: grid;
+    grid-template-columns: calc(70% - 15px) calc(30% - 10px);
+    gap: 20px;
+    margin: 2rem 0;
+
+    .main-container {
+      .sub-header {
+        color: #2d2d2d;
+        font-size: 1.5rem;
+        font-weight: 700;
+        line-height: 1.6875rem;
+        margin: 1.5rem 0;
+      }
+
+      .body-text {
+        color: #313132;
+        font-size: 1rem;
+        line-height: 1.6875rem;
+        margin-top: 1.5rem;
+      }
+
+      .ordered-list {
+        list-style-type: lower-alpha;
+      }
+
+      .margin-left-2 {
+        margin-left: 2rem;
+      }
+
+      .body-grid-container {
+        display: flex;
+
+        .first-row,
+        .second-row {
+          flex: 0.5;
+
+          .grid-column {
+            background-image: linear-gradient(
+              to bottom,
+              rgba(255, 255, 255, 0) 1px,
+              #fcba19 1px
+            );
+            background-position: bottom;
+            background-size: 20% 3px;
+            background-repeat: no-repeat;
+            padding: 1rem 1rem 1rem 0;
+            min-height: 13rem;
+
+            p {
+              color: #707070;
+              font-size: 1rem;
+              font-style: italic;
+            }
+          }
+        }
+      }
+    }
+
+    .definitions-container {
+      .sub-header {
+        color: #2d2d2d;
+        font-size: 1.5rem;
+        font-weight: 700;
+        line-height: 1.6875rem;
+        margin: 1.5rem 0;
+      }
 
-.uaa li {
-  display: flex;
-  margin-bottom: 1rem;
+      .sidebar-header {
+        color: #2d2d2d;
+        font-size: 1.25rem;
+      }
 
-  p.uaa-section-bullet-inside {
-    margin-bottom: 0;
-    margin-left: 2rem;
+      .sidebar-body {
+        color: #707070;
+        font-size: 1rem;
+      }
+    }
   }
 }
 
-.uaa-section {
-  display: flex;
-  margin-left: 2rem;
-
-  .uaa-section-bullet {
-    margin-left: 1rem;
+.viewport-small {
+  .content-header h1 {
+    font-size: 40px;
   }
 }
 
-.section {
-  padding: 5px;
+.viewport-xsmall {
+  .content-header h1 {
+    font-size: 40px;
+  }
+
+  .page-sections {
+    grid-template-columns: 100%;
+
+    .main-container {
+      .sub-header {
+        font-size: 1.2rem;
+      }
+
+      .body-text {
+        font-size: 0.8rem;
+      }
+
+      .margin-left-2 {
+        margin-left: 1.2rem;
+      }
+
+      .body-grid-container {
+        display: flex;
+
+        .first-row,
+        .second-row {
+          .grid-column {
+            p {
+              font-size: 0.8rem;
+            }
+          }
+        }
+      }
+    }
+
+    .definitions-container {
+      .sub-header {
+        font-size: 1.2rem;
+      }
+
+      .sidebar-header {
+        font-size: 1rem;
+      }
+
+      .sidebar-body {
+        font-size: 0.8rem;
+      }
+    }
+  }
 }
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.ts b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.ts
index 8bd64baed..9eba963b2 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/components/user-access-agreement-document/user-access-agreement-document.component.ts
@@ -1,6 +1,7 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 
 import {
+  InjectViewportCssClassDirective,
   PageHeaderComponent,
   PageSectionComponent,
   PageSubheaderComponent,
@@ -14,7 +15,12 @@ import { userAccessAgreementTitle } from '@app/features/profile/pages/user-acces
   styleUrls: ['./user-access-agreement-document.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [PageHeaderComponent, PageSectionComponent, PageSubheaderComponent],
+  imports: [
+    PageHeaderComponent,
+    PageSectionComponent,
+    InjectViewportCssClassDirective,
+    PageSubheaderComponent,
+  ],
 })
 export class UserAccessAgreementDocumentComponent {
   public readonly title: string;
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement-routing.routes.ts b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement-routing.routes.ts
index c1eae3d17..3156bd931 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement-routing.routes.ts
@@ -16,11 +16,6 @@ export const routes: Routes = [
       title: userAccessAgreementTitle,
       routes: {
         root: '../../',
-        setDashboardTitleGuard: {
-          titleText: 'Welcome to OneHealthID Service',
-          titleDescriptionText:
-            'Complete your profile to gain access to the systems you are eligible for',
-        },
       },
     },
   },
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.html b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.html
index 187f2d0b1..1fa4a9758 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.html
+++ b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.html
@@ -1,55 +1,54 @@
-<div class="container">
-<ui-page mode="full">
-  <ui-alert
-    *ngIf="accessRequestFailed"
-    type="danger"
-    icon="error_outline"
-    iconType="outlined"
-    heading="Error Accept Agreement">
-    <ng-container uiAlertContent>
-      <p>
-        Your acceptance of the agreement could not be processed at this time. If
-        this issue persists, contact
-        <a
-          uiAnchor
-          scheme="mailto"
-          [attr.href]="specialAuthoritySupportEmail"></a>
-        for assistance.
-      </p>
-    </ng-container>
-  </ui-alert>
+<div class="container" uiPidpInjectViewportCss>
+  <ui-page mode="full">
+    <ui-alert
+      *ngIf="accessRequestFailed"
+      type="danger"
+      icon="error_outline"
+      iconType="outlined"
+      heading="Error Accept Agreement">
+      <ng-container uiAlertContent>
+        <p>
+          Your acceptance of the agreement could not be processed at this time.
+          If this issue persists, contact
+          <a
+            uiAnchor
+            scheme="mailto"
+            [attr.href]="specialAuthoritySupportEmail"></a>
+          for assistance.
+        </p>
+      </ng-container>
+    </ui-alert>
 
-  <app-user-access-agreement-document></app-user-access-agreement-document>
+    <app-user-access-agreement-document></app-user-access-agreement-document>
 
-  <p *ngIf="!completed">
-    <strong>
-      I,
-      <span class="signature"
-        >{{ (dashboardState$ | async)?.userProfileFullNameText }}</span
-      >, represent and warrant that all information provided in connection with
-      my application for access to the System(s), is true and correct.
-    </strong>
-  </p>
+    <p *ngIf="!completed" class="padding-container">
+      <span
+        >I,
+        <b>{{ (dashboardState$ | async)?.userProfileFullNameText }}</b
+        >, represent and warrant that all information provided in connection with
+        my application for access to the System(s), is true and correct.</span
+      >
+    </p>
 
-  <ui-page-footer [mode]="completed ? 'reverse' : 'normal'">
-    <button
-      class="back-button"
-      mat-stroked-button
-      uiPageFooterAction
-      color="primary"
-      type="button"
-      (click)="onBack()">
-      Back Home
-    </button>
-    <button
-      *ngIf="!completed"
-      mat-flat-button
-      uiPageFooterAction
-      color="primary"
-      type="button"
-      (click)="onAcceptAgreement()">
-      Accept Agreement
-    </button>
-  </ui-page-footer>
-</ui-page>
+    <div class="button-container">
+      <button
+        class="back-button"
+        mat-stroked-button
+        uiPageFooterAction
+        color="primary"
+        type="button"
+        (click)="onBack()">
+        Back
+      </button>
+      <button
+        *ngIf="!completed"
+        mat-flat-button
+        uiPageFooterAction
+        color="primary"
+        type="button"
+        (click)="onAcceptAgreement()">
+        Accept Agreement
+      </button>
+    </div>
+  </ui-page>
 </div>
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.scss b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.scss
index f0b3b42ff..0b4097e8d 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.scss
+++ b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.scss
@@ -14,4 +14,25 @@ p {
 
 .viewport-all {
   padding: 1.25rem 0.75rem;
+
+  .padding-container {
+    padding: 0 0.75rem;
+    margin-bottom: 1rem;
+    grid-template-columns: calc(70% - 15px);
+    display: grid;
+    margin-top: -1rem;
+  }
+}
+
+.viewport-xsmall {
+  .padding-container {
+    grid-template-columns: 100%;
+  }
+}
+
+.button-container {
+  .back-button {
+    margin-right: 2rem;
+    margin-left: 0.75rem;
+  }
 }
diff --git a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.ts b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.ts
index 205428c71..cef6ca283 100644
--- a/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.ts
+++ b/workspace/apps/pidp/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.ts
@@ -6,13 +6,11 @@ import { ActivatedRoute, Router } from '@angular/router';
 
 import { Observable, catchError, noop, of, tap } from 'rxjs';
 
-import { DashboardStateModel, PidpStateName } from '@pidp/data-model';
-import { AppStateService } from '@pidp/presentation';
-
 import {
   AlertComponent,
   AlertContentDirective,
   AnchorDirective,
+  InjectViewportCssClassDirective,
   PageComponent,
   PageFooterActionDirective,
   PageFooterComponent,
@@ -23,6 +21,11 @@ import { LoggerService } from '@app/core/services/logger.service';
 import { UtilsService } from '@app/core/services/utils.service';
 import { specialAuthorityEformsSupportEmail } from '@app/features/access/pages/sa-eforms/sa-eforms.constants';
 import { StatusCode } from '@app/features/portal/enums/status-code.enum';
+import {
+  DashboardStateModel,
+  PidpStateName,
+} from '@app/features/portal/models/state.model';
+import { AppStateService } from '@app/features/shell/services/app-state.service';
 
 import { UserAccessAgreementDocumentComponent } from './components/user-access-agreement-document/user-access-agreement-document.component';
 import { UserAccessAgreementResource } from './user-access-agreement-resource.service';
@@ -37,6 +40,7 @@ import { UserAccessAgreementResource } from './user-access-agreement-resource.se
     AlertContentDirective,
     AnchorDirective,
     AsyncPipe,
+    InjectViewportCssClassDirective,
     forwardRef(() => UserAccessAgreementDocumentComponent),
     MatButtonModule,
     NgIf,
diff --git a/workspace/libs/shared/ui/src/lib/modules/dashboard/components/navbar-menu/nav-menu.html b/workspace/apps/pidp/src/app/features/shell/components/navbar-menu/nav-menu.html
similarity index 73%
rename from workspace/libs/shared/ui/src/lib/modules/dashboard/components/navbar-menu/nav-menu.html
rename to workspace/apps/pidp/src/app/features/shell/components/navbar-menu/nav-menu.html
index b0a8b2818..96c1fcfbc 100644
--- a/workspace/libs/shared/ui/src/lib/modules/dashboard/components/navbar-menu/nav-menu.html
+++ b/workspace/apps/pidp/src/app/features/shell/components/navbar-menu/nav-menu.html
@@ -7,6 +7,8 @@
       mat-icon-button
       (click)="onMiniMenuButtonClick()">
       <mat-icon>menu</mat-icon>
+      <span
+        [ngClass]="{'menu-notification-dot': dashboardState.alerts.includes(AlertCode.TRANSIENT_ERROR) || dashboardState.alerts.includes(AlertCode.PLR_BAD_STANDING)}"></span>
     </button>
   </div>
   <div *ngIf="isTopMenuVisible" uiPidpInjectViewportCss>
@@ -30,21 +32,30 @@
     <div class="main-menu">
       <a class="main-menu-item">
         <div class="dropdown">
-          <a class="dropdown-profile">Profile</a>
+          <span class="content-with-alert"
+            ><fa-icon
+              *ngIf="dashboardState.alerts.includes(AlertCode.TRANSIENT_ERROR) || dashboardState.alerts.includes(AlertCode.PLR_BAD_STANDING)"
+              class="fa-duotone"
+              [icon]="faBell"></fa-icon
+            ><a class="dropdown-profile">Profile</a></span
+          >
           <div class="dropdown-content">
             <a
               class="dropdown-links"
-              (click)="navigateTo('/profile/personal-information')"
+              (click)="navigateTo(ProfileRoutes.routePath(ProfileRoutes.PERSONAL_INFO))"
               >Personal Information</a
             >
             <a
               class="dropdown-links"
               (click)="navigateTo(dashboardState.collegeRoute)"
-              >College License</a
-            >
+              >College License<fa-icon
+                *ngIf="dashboardState.alerts.includes(AlertCode.TRANSIENT_ERROR) || dashboardState.alerts.includes(AlertCode.PLR_BAD_STANDING)"
+                class="fa-duotone"
+                [icon]="faBell"></fa-icon
+            ></a>
             <a
               class="dropdown-links"
-              (click)="navigateTo('/profile/user-access-agreement')"
+              (click)="navigateTo(ProfileRoutes.routePath(ProfileRoutes.USER_ACCESS_AGREEMENT))"
               >User Access Agreement</a
             >
           </div>
@@ -56,7 +67,6 @@
         routerLinkActive="main-menu-item-active"
         [routerLink]="getRouterLink(menuItem)"
         [routerLinkActiveOptions]="getRouterLinkActiveOptions(menuItem)"
-        [fragment]="getRouterLinkFragment(menuItem)"
         (click)="onMenuItemClicked()"
         >{{ menuItem.label }}
       </a>
@@ -94,7 +104,7 @@
         <div class="sidenav-menu">
           <a
             class="sidenav-menu-item"
-            (click)="navigateTo('/profile/personal-information')"
+            (click)="navigateTo(ProfileRoutes.routePath(ProfileRoutes.PERSONAL_INFO))"
             >Personal Information</a
           >
           <a
@@ -102,9 +112,11 @@
             (click)="navigateTo(dashboardState.collegeRoute)"
             >College License</a
           >
+          <span
+            [ngClass]="{'menu-list-notification-dot': dashboardState.alerts.includes(AlertCode.TRANSIENT_ERROR) || dashboardState.alerts.includes(AlertCode.PLR_BAD_STANDING)}"></span>
           <a
             class="sidenav-menu-item"
-            (click)="navigateTo('/profile/user-access-agreement')"
+            (click)="navigateTo(ProfileRoutes.routePath(ProfileRoutes.USER_ACCESS_AGREEMENT))"
             >User Access Agreement</a
           >
           <a
diff --git a/workspace/libs/shared/ui/src/lib/modules/dashboard/components/navbar-menu/nav-menu.scss b/workspace/apps/pidp/src/app/features/shell/components/navbar-menu/nav-menu.scss
similarity index 92%
rename from workspace/libs/shared/ui/src/lib/modules/dashboard/components/navbar-menu/nav-menu.scss
rename to workspace/apps/pidp/src/app/features/shell/components/navbar-menu/nav-menu.scss
index 70e55739c..ce7976f2f 100644
--- a/workspace/libs/shared/ui/src/lib/modules/dashboard/components/navbar-menu/nav-menu.scss
+++ b/workspace/apps/pidp/src/app/features/shell/components/navbar-menu/nav-menu.scss
@@ -163,6 +163,26 @@ h1 {
   }
 }
 
+.menu-notification-dot {
+  position: absolute;
+  top: 8px;
+  right: 5px;
+  width: 10px;
+  height: 10px;
+  background-color: red;
+  border-radius: 50%;
+}
+
+.menu-list-notification-dot {
+  position: absolute;
+  top: 90px;
+  right: 213px;
+  width: 10px;
+  height: 10px;
+  background-color: red;
+  border-radius: 50%;
+}
+
 .btn-signout {
   text-align: center;
   width: 115px;
@@ -261,6 +281,14 @@ h1 {
   right: -10px;
 }
 
+.content-with-alert {
+  display: flex;
+  align-items: center;
+  fa-icon {
+    color: red;
+  }
+}
+
 .dropdown-profile {
   cursor: pointer;
   padding-right: 20px !important;
@@ -273,7 +301,6 @@ h1 {
   min-width: 130px;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2);
   z-index: 1;
-  margin-top: 40px;
 }
 
 .dropdown-content a {
@@ -286,6 +313,10 @@ h1 {
 .dropdown-content .dropdown-links {
   cursor: pointer;
   width: 100%;
+  fa-icon {
+    color: red;
+    margin-left: 5px;
+  }
 }
 
 .dropdown-content a:hover {
diff --git a/workspace/libs/shared/ui/src/lib/modules/dashboard/components/navbar-menu/nav-menu.ts b/workspace/apps/pidp/src/app/features/shell/components/navbar-menu/nav-menu.ts
similarity index 70%
rename from workspace/libs/shared/ui/src/lib/modules/dashboard/components/navbar-menu/nav-menu.ts
rename to workspace/apps/pidp/src/app/features/shell/components/navbar-menu/nav-menu.ts
index ff022a652..37e18e62a 100644
--- a/workspace/libs/shared/ui/src/lib/modules/dashboard/components/navbar-menu/nav-menu.ts
+++ b/workspace/apps/pidp/src/app/features/shell/components/navbar-menu/nav-menu.ts
@@ -1,4 +1,4 @@
-import { NgFor, NgIf, NgTemplateOutlet } from '@angular/common';
+import { NgClass, NgFor, NgIf, NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -24,17 +24,25 @@ import {
   RouterOutlet,
 } from '@angular/router';
 
-import { DashboardStateModel } from '@pidp/data-model';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { faBell } from '@fortawesome/free-regular-svg-icons';
 
+import {
+  DashboardMenuItem,
+  DashboardRouteMenuItem,
+  InjectViewportCssClassDirective,
+  LayoutHeaderFooterComponent,
+  PidpViewport,
+  ViewportService,
+} from '@bcgov/shared/ui';
 import { RoutePath } from '@bcgov/shared/utils';
 
-import { LayoutHeaderFooterComponent } from '../../../../components/layout-header-footer/layout-header-footer.component';
-import { InjectViewportCssClassDirective } from '../../../../directives/viewport-css.directive';
-import { PidpViewport, ViewportService } from '../../../../services';
-import { DashboardMenuItem, DashboardRouteMenuItem } from '../../models';
+import { AlertCode } from '@app/features/portal/enums/alert-code.enum';
+import { DashboardStateModel } from '@app/features/portal/models/state.model';
+import { ProfileRoutes } from '@app/features/profile/profile.routes';
 
 @Component({
-  selector: 'ui-nav-menu',
+  selector: 'app-nav-menu',
   templateUrl: './nav-menu.html',
   styleUrls: ['./nav-menu.scss'],
   standalone: true,
@@ -51,6 +59,8 @@ import { DashboardMenuItem, DashboardRouteMenuItem } from '../../models';
     RouterLink,
     RouterLinkActive,
     RouterOutlet,
+    FaIconComponent,
+    NgClass,
   ],
 })
 export class NavMenuComponent implements OnChanges {
@@ -79,6 +89,10 @@ export class NavMenuComponent implements OnChanges {
   public isLogoutButtonVisible = false;
   public isLogoutMenuItemVisible = false;
   public isTopMenuVisible = false;
+  public ProfileRoutes = ProfileRoutes;
+  public showCollegeAlert = false;
+  public faBell = faBell;
+  public AlertCode = AlertCode;
 
   public get showTitle(): boolean {
     return !!this.dashboardState.titleText;
@@ -111,6 +125,10 @@ export class NavMenuComponent implements OnChanges {
   }
 
   public navigateTo(route: string): void {
+    if (this.showMiniMenuButton)
+      this.isSidenavOpened = this.isSidenavOpened
+        ? !this.isSidenavOpened
+        : this.isSidenavOpened;
     this.router.navigateByUrl(route);
   }
 
@@ -145,7 +163,7 @@ export class NavMenuComponent implements OnChanges {
     this.logout.emit();
   }
   public onMenuItemClicked(): void {
-    if (this.sidenavMode === 'over') {
+    if (this.showMiniMenuButton && this.sidenavMode === 'over') {
       this.sidenav.close();
     }
   }
@@ -155,35 +173,19 @@ export class NavMenuComponent implements OnChanges {
     this.refresh();
   }
   private refresh(): void {
-    switch (this.viewport) {
-      case PidpViewport.xsmall:
-        this.showMiniMenuButton = true;
-        this.isSidenavOpened = false;
-        this.sidenavMode = 'over';
-
-        this.isLogoutButtonVisible = false;
-        this.isLogoutMenuItemVisible = true;
-        this.isTopMenuVisible = false;
-        break;
-      case PidpViewport.small:
-        this.showMiniMenuButton = false;
-        this.isSidenavOpened = false;
-        this.sidenavMode = 'over';
-        this.isLogoutButtonVisible = true;
-        this.isLogoutMenuItemVisible = true;
-        this.isTopMenuVisible = true;
-        break;
-      case PidpViewport.medium:
-      case PidpViewport.large:
-        this.showMiniMenuButton = false;
-        this.isSidenavOpened = true;
-        this.sidenavMode = 'side';
-        this.isLogoutButtonVisible = true;
-        this.isLogoutMenuItemVisible = false;
-        this.isTopMenuVisible = true;
-        break;
-      default:
-        throw new Error(`Nav Menu not implemented: ${this.viewport}`);
+    if(!([PidpViewport.xsmall, PidpViewport.small, PidpViewport.medium, PidpViewport.large].includes(this.viewport))) {
+      throw new Error(`Nav Menu not implemented: ${this.viewport}`);
     }
+
+
+    const isMiniView = this.viewport === PidpViewport.xsmall;
+    const isDesktopView = this.viewport === PidpViewport.medium || this.viewport === PidpViewport.large;
+
+    this.showMiniMenuButton = isMiniView;
+    this.isSidenavOpened = isDesktopView;
+    this.sidenavMode = isDesktopView ? 'side' : 'over';
+    this.isLogoutButtonVisible = !isMiniView;
+    this.isLogoutMenuItemVisible = !isDesktopView;
+    this.isTopMenuVisible = !isMiniView;
   }
 }
diff --git a/workspace/apps/pidp/src/app/features/shell/components/portal-dashboard/portal-dashboard.component.html b/workspace/apps/pidp/src/app/features/shell/components/portal-dashboard/portal-dashboard.component.html
index c7f8b5480..5d5f05bf6 100644
--- a/workspace/apps/pidp/src/app/features/shell/components/portal-dashboard/portal-dashboard.component.html
+++ b/workspace/apps/pidp/src/app/features/shell/components/portal-dashboard/portal-dashboard.component.html
@@ -1,6 +1,6 @@
-<ui-nav-menu
+<app-nav-menu
   [dashboardState]="(dashboardState$ | async)!"
   [emailSupport]="providerIdentitySupport"
   [menuItems]="menuItems"
   (logout)="onLogout()">
-</ui-nav-menu>
+</app-nav-menu>
diff --git a/workspace/apps/pidp/src/app/features/shell/components/portal-dashboard/portal-dashboard.component.ts b/workspace/apps/pidp/src/app/features/shell/components/portal-dashboard/portal-dashboard.component.ts
index 15ff36387..d366350a6 100644
--- a/workspace/apps/pidp/src/app/features/shell/components/portal-dashboard/portal-dashboard.component.ts
+++ b/workspace/apps/pidp/src/app/features/shell/components/portal-dashboard/portal-dashboard.component.ts
@@ -4,24 +4,25 @@ import { IsActiveMatchOptions } from '@angular/router';
 
 import { Observable, map } from 'rxjs';
 
-import { DashboardStateModel, PidpStateName } from '@pidp/data-model';
-import { AppStateService } from '@pidp/presentation';
-
 import {
   DashboardHeaderConfig,
   DashboardMenuItem,
   DashboardRouteMenuItem,
   IDashboard,
-  NavMenuComponent,
 } from '@bcgov/shared/ui';
 
 import { APP_CONFIG, AppConfig } from '@app/app.config';
+import { AccessRoutes } from '@app/features/access/access.routes';
 import { AccessTokenService } from '@app/features/auth/services/access-token.service';
 import { AuthService } from '@app/features/auth/services/auth.service';
-import { PermissionsService } from '@app/modules/permissions/permissions.service';
+import {
+  DashboardStateModel,
+  PidpStateName,
+} from '@app/features/portal/models/state.model';
 
+import { AppStateService } from '../../services/app-state.service';
 import { DashboardStateService } from '../../services/dashboard-state-service.service';
-import { AccessRoutes } from '@app/features/access/access.routes';
+import { NavMenuComponent } from '../navbar-menu/nav-menu';
 
 @Component({
   selector: 'app-portal-dashboard',
@@ -45,7 +46,6 @@ export class PortalDashboardComponent implements IDashboard, OnInit {
   public constructor(
     @Inject(APP_CONFIG) private config: AppConfig,
     private authService: AuthService,
-    private permissionsService: PermissionsService,
     accessTokenService: AccessTokenService,
     private dashboardStateService: DashboardStateService,
     private stateService: AppStateService,
@@ -98,7 +98,7 @@ export class PortalDashboardComponent implements IDashboard, OnInit {
       new DashboardRouteMenuItem(
         'Access',
         {
-          commands:[AccessRoutes.BASE_PATH,AccessRoutes.ACCESS_REQUESTS],
+          commands: [AccessRoutes.BASE_PATH, AccessRoutes.ACCESS_REQUESTS],
           linkActiveOptions,
         },
         'assignment',
diff --git a/workspace/libs/pidp/presentation/src/lib/services/app-state.service.ts b/workspace/apps/pidp/src/app/features/shell/services/app-state.service.ts
similarity index 97%
rename from workspace/libs/pidp/presentation/src/lib/services/app-state.service.ts
rename to workspace/apps/pidp/src/app/features/shell/services/app-state.service.ts
index 6570a6c2c..e481f39da 100644
--- a/workspace/libs/pidp/presentation/src/lib/services/app-state.service.ts
+++ b/workspace/apps/pidp/src/app/features/shell/services/app-state.service.ts
@@ -6,7 +6,7 @@ import {
   ApplicationStateModel,
   NamedState,
   defaultApplicationState,
-} from '@pidp/data-model';
+} from '@app/features/portal/models/state.model';
 
 @Injectable({
   providedIn: 'root',
diff --git a/workspace/libs/pidp/presentation/src/lib/services/application.service.ts b/workspace/apps/pidp/src/app/features/shell/services/application.service.ts
similarity index 86%
rename from workspace/libs/pidp/presentation/src/lib/services/application.service.ts
rename to workspace/apps/pidp/src/app/features/shell/services/application.service.ts
index 955871020..3dba8a3ac 100644
--- a/workspace/libs/pidp/presentation/src/lib/services/application.service.ts
+++ b/workspace/apps/pidp/src/app/features/shell/services/application.service.ts
@@ -1,6 +1,9 @@
 import { Injectable } from '@angular/core';
 
-import { DashboardStateModel, PidpStateName } from '@pidp/data-model';
+import {
+  DashboardStateModel,
+  PidpStateName,
+} from '@app/features/portal/models/state.model';
 
 import { AppStateService } from './app-state.service';
 
diff --git a/workspace/apps/pidp/src/app/features/shell/services/dashboard-state-service.service.spec.ts b/workspace/apps/pidp/src/app/features/shell/services/dashboard-state-service.service.spec.ts
index b5bb7aa7e..3b3de851d 100644
--- a/workspace/apps/pidp/src/app/features/shell/services/dashboard-state-service.service.spec.ts
+++ b/workspace/apps/pidp/src/app/features/shell/services/dashboard-state-service.service.spec.ts
@@ -1,16 +1,19 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { TestBed } from '@angular/core/testing';
 
-import { DashboardStateModel, PidpStateName } from '@pidp/data-model';
-import { AppStateService } from '@pidp/presentation';
 import { MockProfileStatus } from '@test/mock-profile-status';
 import { Spy, createSpyFromClass, provideAutoSpy } from 'jest-auto-spies';
 
 import { PartyService } from '@app/core/party/party.service';
 import { ProfileStatus } from '@app/features/portal/models/profile-status.model';
+import {
+  DashboardStateModel,
+  PidpStateName,
+} from '@app/features/portal/models/state.model';
 import { PortalResource } from '@app/features/portal/portal-resource.service';
 import { LookupService } from '@app/modules/lookup/lookup.service';
 
+import { AppStateService } from './app-state.service';
 import { DashboardStateService } from './dashboard-state-service.service';
 
 describe('DashboardStateService', () => {
diff --git a/workspace/apps/pidp/src/app/features/shell/services/dashboard-state-service.service.ts b/workspace/apps/pidp/src/app/features/shell/services/dashboard-state-service.service.ts
index 23fe3d74a..3c67132ec 100644
--- a/workspace/apps/pidp/src/app/features/shell/services/dashboard-state-service.service.ts
+++ b/workspace/apps/pidp/src/app/features/shell/services/dashboard-state-service.service.ts
@@ -1,14 +1,17 @@
 import { Injectable } from '@angular/core';
 
-import { DashboardStateModel, PidpStateName } from '@pidp/data-model';
-import { AppStateService } from '@pidp/presentation';
-
 import { PartyService } from '@app/core/party/party.service';
 import { ProfileStatus } from '@app/features/portal/models/profile-status.model';
+import {
+  DashboardStateModel,
+  PidpStateName,
+} from '@app/features/portal/models/state.model';
 import { PortalResource } from '@app/features/portal/portal-resource.service';
 import { ProfileRoutes } from '@app/features/profile/profile.routes';
 import { LookupService } from '@app/modules/lookup/lookup.service';
 
+import { AppStateService } from './app-state.service';
+
 @Injectable({
   providedIn: 'root',
 })
@@ -31,6 +34,7 @@ export class DashboardStateService {
         const displayFullName = this.getUserDisplayFullName(profileStatus);
         const collegeName = this.getCollegeName(profileStatus);
         const collegeRoute = this.getCollegeRoute(profileStatus);
+        const alerts = profileStatus?.alerts ?? [];
 
         // Set the user name and college on the dashboard.
         const oldState = this.stateService.getNamedState<DashboardStateModel>(
@@ -41,6 +45,7 @@ export class DashboardStateService {
           userProfileFullNameText: displayFullName,
           userProfileCollegeNameText: collegeName,
           collegeRoute,
+          alerts,
         };
         this.stateService.setNamedState(PidpStateName.dashboard, newState);
       });
diff --git a/workspace/apps/pidp/src/app/features/training/pages/compliance-training/compliance-training-routing.routes.ts b/workspace/apps/pidp/src/app/features/training/pages/compliance-training/compliance-training-routing.routes.ts
index 1f16456df..bbbb2e0b5 100644
--- a/workspace/apps/pidp/src/app/features/training/pages/compliance-training/compliance-training-routing.routes.ts
+++ b/workspace/apps/pidp/src/app/features/training/pages/compliance-training/compliance-training-routing.routes.ts
@@ -11,11 +11,6 @@ export const routes: Routes = [
       routes: {
         root: '../../',
       },
-      setDashboardTitleGuard: {
-        titleText: 'Welcome to OneHealthID Service',
-        titleDescriptionText:
-          'Complete your profile to gain access to the systems you are eligible for',
-      },
     },
   },
 ];
diff --git a/workspace/apps/pidp/src/assets/images/doctor.jpg b/workspace/apps/pidp/src/assets/images/doctor.jpg
deleted file mode 100644
index ea7cbebe1..000000000
Binary files a/workspace/apps/pidp/src/assets/images/doctor.jpg and /dev/null differ
diff --git a/workspace/apps/pidp/src/assets/images/doctor1.jpg b/workspace/apps/pidp/src/assets/images/doctor1.jpg
new file mode 100644
index 000000000..628425b2b
Binary files /dev/null and b/workspace/apps/pidp/src/assets/images/doctor1.jpg differ
diff --git a/workspace/apps/pidp/src/assets/images/icons/account-image.svg b/workspace/apps/pidp/src/assets/images/icons/account-image.svg
new file mode 100644
index 000000000..da3cd44a7
--- /dev/null
+++ b/workspace/apps/pidp/src/assets/images/icons/account-image.svg
@@ -0,0 +1,5 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="mdi:account">
+<path id="Vector" d="M19.9998 6.66675C21.7679 6.66675 23.4636 7.36913 24.7139 8.61937C25.9641 9.86961 26.6665 11.5653 26.6665 13.3334C26.6665 15.1015 25.9641 16.7972 24.7139 18.0475C23.4636 19.2977 21.7679 20.0001 19.9998 20.0001C18.2317 20.0001 16.536 19.2977 15.2858 18.0475C14.0355 16.7972 13.3332 15.1015 13.3332 13.3334C13.3332 11.5653 14.0355 9.86961 15.2858 8.61937C16.536 7.36913 18.2317 6.66675 19.9998 6.66675ZM19.9998 23.3334C27.3665 23.3334 33.3332 26.3167 33.3332 30.0001V33.3334H6.6665V30.0001C6.6665 26.3167 12.6332 23.3334 19.9998 23.3334Z" fill="#003366"/>
+</g>
+</svg>
diff --git a/workspace/apps/pidp/src/scss/material/_material-overrides.scss b/workspace/apps/pidp/src/scss/material/_material-overrides.scss
index ab827808e..c6197c20a 100644
--- a/workspace/apps/pidp/src/scss/material/_material-overrides.scss
+++ b/workspace/apps/pidp/src/scss/material/_material-overrides.scss
@@ -43,6 +43,115 @@
   }
 }
 
+.dialog-padding {
+  mat-dialog-container {
+    padding: 0.5rem;
+  }
+}
+
+.care-team-tabs {
+  .mat-mdc-tab {
+    border: 1px solid #9e9e9e;
+    background: #eee;
+
+    &.mdc-tab--active {
+      background: #e3e7f3;
+    }
+  }
+}
+
+.faq-expansion-panel {
+  &.mat-expansion-panel {
+    box-shadow: none !important;
+
+    .mat-expansion-panel-header {
+      padding: 0;
+      line-height: 1.5;
+
+      &:hover {
+        background: none !important;
+      }
+    }
+
+    .mat-expansion-indicator,
+    .mat-expansion-indicator::after {
+      border-width: 0 3px 3px 0 !important;
+
+      &::after {
+        color: #cccccc;
+      }
+    }
+
+    .mat-expansion-panel-body {
+      padding: 0;
+      line-height: 1.5;
+    }
+  }
+}
+
+.viewport-large {
+  .care-team-tabs {
+    .mat-mdc-tab-group {
+      .mat-mdc-tab {
+        width: 18.625rem;
+        height: 3.75rem;
+      }
+    }
+  }
+}
+
+.viewport-medium {
+  .care-team-tabs {
+    .mat-mdc-tab-group {
+      .mat-mdc-tab {
+        width: 18.625rem;
+        height: 3.75rem;
+      }
+    }
+  }
+}
+
+.viewport-small {
+  .care-team-tabs {
+    .mat-mdc-tab-group {
+      .mat-mdc-tab {
+        width: 15.625rem;
+        height: 3.75rem;
+      }
+    }
+  }
+}
+
+.viewport-xsmall {
+  .faq-expansion-panel {
+    &.mat-expansion-panel {
+      .mat-expansion-panel-header {
+        font-size: 0.75rem;
+        height: auto;
+      }
+
+      .mat-expansion-panel-header-title {
+        margin-right: 2px;
+      }
+
+      .mat-expansion-indicator,
+      .mat-expansion-indicator::after {
+        border-width: 0 2px 2px 0 !important;
+        padding: 3px !important;
+        margin-bottom: 5px;
+      }
+
+      .mat-expansion-panel-body {
+        p:first-of-type {
+          padding-top: 5px;
+        }
+
+        font-size: 0.75rem;
+      }
+    }
+  }
+}
+
 .viewport-xsmall,
 .viewport-small {
   .mat-horizontal-stepper-header-container {
diff --git a/workspace/apps/pidp/src/scss/material/_material.scss b/workspace/apps/pidp/src/scss/material/_material.scss
index 13f7a49fa..8a25c2483 100644
--- a/workspace/apps/pidp/src/scss/material/_material.scss
+++ b/workspace/apps/pidp/src/scss/material/_material.scss
@@ -3,7 +3,6 @@
 // ---
 
 @import './material-theme';
-@import './material-overrides';
 @import './components/mat-alert';
 @import './components/mat-button';
 @import './components/mat-card';
@@ -12,3 +11,4 @@
 @import './components/mat-radio-button';
 @import './components/mat-sidenav';
 @import './components/mat-tab-group';
+@import './material-overrides';
diff --git a/workspace/libs/pidp/data-model/src/index.ts b/workspace/libs/pidp/data-model/src/index.ts
index 819839ea4..bb73439d5 100644
--- a/workspace/libs/pidp/data-model/src/index.ts
+++ b/workspace/libs/pidp/data-model/src/index.ts
@@ -1,2 +1 @@
 export * from './lib/models/registered-college.model';
-export * from './lib/models/state.model';
diff --git a/workspace/libs/pidp/data-model/tsconfig.lib.json b/workspace/libs/pidp/data-model/tsconfig.lib.json
index 9778b31d2..d8420b24c 100644
--- a/workspace/libs/pidp/data-model/tsconfig.lib.json
+++ b/workspace/libs/pidp/data-model/tsconfig.lib.json
@@ -13,5 +13,8 @@
     "**/*.test.ts",
     "jest.config.ts"
   ],
-  "include": ["**/*.ts"]
+  "include": [
+    "**/*.ts",
+    "../../../apps/pidp/src/app/features/portal/models/state.model.ts"
+  ]
 }
diff --git a/workspace/libs/pidp/presentation/src/index.ts b/workspace/libs/pidp/presentation/src/index.ts
index a718c0e5a..46bc697d7 100644
--- a/workspace/libs/pidp/presentation/src/index.ts
+++ b/workspace/libs/pidp/presentation/src/index.ts
@@ -1,5 +1,2 @@
-export * from './lib/guards/set-dashboard-title.guard';
-export * from './lib/services/app-state.service';
-export * from './lib/services/application.service';
 export * from './lib/services/loading-overlay.service';
 export * from './lib/services/navigation.service';
diff --git a/workspace/libs/pidp/presentation/src/lib/guards/set-dashboard-title.guard.spec.ts b/workspace/libs/pidp/presentation/src/lib/guards/set-dashboard-title.guard.spec.ts
deleted file mode 100644
index c1d2d64a5..000000000
--- a/workspace/libs/pidp/presentation/src/lib/guards/set-dashboard-title.guard.spec.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { CanActivateFn } from '@angular/router';
-
-import { setDashboardTitleGuard } from './set-dashboard-title.guard';
-
-describe('setDashboardTitleGuard', () => {
-  const executeGuard: CanActivateFn = (...guardParameters) =>
-    TestBed.runInInjectionContext(() =>
-      setDashboardTitleGuard(...guardParameters),
-    );
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-  });
-
-  it('should be created', () => {
-    expect(executeGuard).toBeTruthy();
-  });
-});
diff --git a/workspace/libs/pidp/presentation/src/lib/guards/set-dashboard-title.guard.ts b/workspace/libs/pidp/presentation/src/lib/guards/set-dashboard-title.guard.ts
deleted file mode 100644
index db4fe5079..000000000
--- a/workspace/libs/pidp/presentation/src/lib/guards/set-dashboard-title.guard.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { inject } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivateFn } from '@angular/router';
-
-import { ApplicationService } from '../services/application.service';
-
-export interface SetDashboardTitleGuardRouteData {
-  titleText: string;
-  titleDescriptionText: string;
-}
-
-/**
- * Use this to set the dashboard title and title description to static text
- * upon activation of any route.
- * Pass in route data named setDashboardTitleGuard that matches the
- * interface SetDashboardTitleGuardRouteData.
- */
-export const setDashboardTitleGuard: CanActivateFn = (
-  route: ActivatedRouteSnapshot,
-) => {
-  const applicationService = inject(ApplicationService);
-
-  const data = route.data
-    .setDashboardTitleGuard as SetDashboardTitleGuardRouteData;
-  if (!data) {
-    throw 'setDashboardTitleGuard requires a route data item named "setDashboardTitleGuard"';
-  }
-
-  applicationService.setDashboardTitleText(
-    data.titleText,
-    data.titleDescriptionText,
-  );
-
-  return true;
-};
diff --git a/workspace/libs/shared/ui/src/lib/modules/dashboard/components/index.ts b/workspace/libs/shared/ui/src/lib/modules/dashboard/components/index.ts
index f1d9d264d..ba8ba8196 100644
--- a/workspace/libs/shared/ui/src/lib/modules/dashboard/components/index.ts
+++ b/workspace/libs/shared/ui/src/lib/modules/dashboard/components/index.ts
@@ -2,4 +2,3 @@ export * from './dashboard/dashboard.component';
 export * from './dashboard-route-menu-item/dashboard-route-menu-item.component';
 export * from './dashboard-header/dashboard-header.component';
 export * from './dashboard-image/dashboard-image.component';
-export * from './navbar-menu/nav-menu';