diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/app-routing.module.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/app-routing.module.ts
index 3c6c2eb2d..af43cb87f 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/app-routing.module.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/app-routing.module.ts
@@ -1,10 +1,10 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { LandingComponent } from './landing.component';
-import { ControllingMemberCrcRoutes } from './modules/controlling-member-crc/controlling-member-crc-routing.module';
-import { PersonalLicenceApplicationRoutes } from './modules/personal-licence-application/personal-licence-application-routing.module';
-import { AccessDeniedComponent } from './shared/components/access-denied.component';
 import { BusinessLicenceApplicationRoutes } from './modules/business-licence-application/business-license-application-routes';
+import { ControllingMemberCrcRoutes } from './modules/controlling-member-crc/controlling-member-crc-routes';
+import { PersonalLicenceApplicationRoutes } from './modules/personal-licence-application/personal-licence-application-routes';
+import { AccessDeniedComponent } from './shared/components/access-denied.component';
 
 export class AppRoutes {
 	public static readonly PERSONAL_LICENCE_APPLICATION = PersonalLicenceApplicationRoutes.MODULE_PATH;
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/application.service.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/application.service.ts
index ba675f4c8..5bc3c9d93 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/application.service.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/application.service.ts
@@ -5,7 +5,6 @@ import {
 	ApplicationInviteStatusCode,
 	ApplicationPortalStatusCode,
 	ApplicationTypeCode,
-	BizLicAppResponse,
 	BizProfileResponse,
 	BizTypeCode,
 	IdentityProviderTypeCode,
@@ -20,9 +19,7 @@ import {
 	PaymentLinkCreateRequest,
 	PaymentLinkResponse,
 	PaymentMethodCode,
-	PermitLicenceAppResponse,
 	WorkerCategoryTypeCode,
-	WorkerLicenceAppResponse,
 	WorkerLicenceTypeCode,
 } from '@app/api/models';
 import { BizMembersService, LicenceAppService, LicenceService, PaymentService } from '@app/api/services';
@@ -30,7 +27,7 @@ import { StrictHttpResponse } from '@app/api/strict-http-response';
 import { AppRoutes } from '@app/app-routing.module';
 import { SPD_CONSTANTS } from '@app/core/constants/constants';
 import { BusinessLicenceApplicationRoutes } from '@app/modules/business-licence-application/business-license-application-routes';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { DialogComponent, DialogOptions } from '@app/shared/components/dialog.component';
 import { FormatDatePipe } from '@app/shared/pipes/format-date.pipe';
 import { OptionsPipe } from '@app/shared/pipes/options.pipe';
@@ -58,16 +55,12 @@ export interface MainApplicationResponse extends LicenceAppListResponse {
 	isControllingMemberWarning?: boolean;
 }
 
-export interface MainLicenceResponse extends WorkerLicenceAppResponse, PermitLicenceAppResponse, BizLicAppResponse {
+export interface MainLicenceResponse extends LicenceResponse {
 	hasLoginNameChanged: boolean;
 	cardHolderName?: null | string;
 	licenceCategoryCodes?: Array<WorkerCategoryTypeCode> | null;
-	licenceHolderName?: null | string;
 	licenceExpiryDate?: string;
 	licenceExpiryNumberOfDays?: null | number;
-	licenceStatusCode?: LicenceStatusCode;
-	licenceId?: null | string;
-	licenceNumber?: null | string;
 	licenceReprintFee: null | number;
 	isRenewalPeriod: boolean;
 	isUpdatePeriod: boolean;
@@ -398,10 +391,10 @@ export class ApplicationService {
 		const response: Array<MainLicenceResponse> = [];
 
 		basicLicenceResps.forEach((basicLicence: LicenceBasicResponse) => {
-			const matchingLicenceResp = licenceResps?.find(
+			const matchingLicence = licenceResps?.find(
 				(item: LicenceBasicResponse) => item.licenceId === basicLicence.licenceId
 			);
-			const licence = this.getLicence(basicLicence, businessProfile.bizTypeCode!, matchingLicenceResp);
+			const licence = this.getLicence(basicLicence, businessProfile.bizTypeCode!, matchingLicence);
 
 			response.push(licence);
 		});
@@ -828,7 +821,7 @@ export class ApplicationService {
 		bizTypeCode: BizTypeCode,
 		matchingLicence?: LicenceResponse | undefined
 	): MainLicenceResponse {
-		const licence = { ...basicLicence } as MainLicenceResponse;
+		const licence = { ...basicLicence, ...matchingLicence } as MainLicenceResponse;
 
 		const licenceReplacementPeriodPreventionDays = SPD_CONSTANTS.periods.licenceReplacementPeriodPreventionDays;
 		const licenceUpdatePeriodPreventionDays = SPD_CONSTANTS.periods.licenceUpdatePeriodPreventionDays;
@@ -842,12 +835,8 @@ export class ApplicationService {
 		const today = moment().startOf('day');
 
 		licence.cardHolderName = basicLicence.nameOnCard;
-		// licence.licenceHolderName = basicLicence.licenceHolderName;
-		// licence.licenceStatusCode = basicLicence.licenceStatusCode;
 		licence.licenceExpiryDate = basicLicence.expiryDate;
 		licence.licenceExpiryNumberOfDays = moment(licence.licenceExpiryDate).startOf('day').diff(today, 'days');
-		// licence.licenceId = basicLicence.licenceId;
-		// licence.licenceNumber = basicLicence.licenceNumber;
 		licence.hasLoginNameChanged = basicLicence.nameOnCard != licence.licenceHolderName;
 		licence.licenceCategoryCodes = basicLicence.categoryCodes ?? [];
 
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/auth-process.service.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/auth-process.service.ts
index 6cee0abe3..f0eef8679 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/auth-process.service.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/auth-process.service.ts
@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
 import { IdentityProviderTypeCode } from '@app/api/models';
 import { AppRoutes } from '@app/app-routing.module';
 import { BusinessLicenceApplicationRoutes } from '@app/modules/business-licence-application/business-license-application-routes';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { OAuthService } from 'angular-oauth2-oidc';
 import { BehaviorSubject } from 'rxjs';
 import { AuthenticationService } from 'src/app/core/services/authentication.service';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/business-application.helper.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/business-application.helper.ts
index 8f28eda34..9fde317e9 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/business-application.helper.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/business-application.helper.ts
@@ -152,19 +152,22 @@ export abstract class BusinessApplicationHelper extends ApplicationHelper {
 	categorySecurityGuardFormGroup: FormGroup = this.formBuilder.group(
 		{
 			isInclude: new FormControl(false),
-			isRequestDogAuthorization: new FormControl(''),
+			useDogs: new FormControl(''),
+			dogsPurposeFormGroup: new FormGroup({
+				isDogsPurposeProtection: new FormControl(false),
+				isDogsPurposeDetectionDrugs: new FormControl(false),
+				isDogsPurposeDetectionExplosives: new FormControl(false),
+			}),
 			attachments: new FormControl([]),
 		},
 		{
 			validators: [
-				FormGroupValidators.conditionalDefaultRequiredValidator(
-					'isRequestDogAuthorization',
-					(form) => form.get('isInclude')?.value
-				),
+				FormGroupValidators.conditionalRequiredValidator('useDogs', (form) => form.get('isInclude')?.value ?? false),
 				FormGroupValidators.conditionalDefaultRequiredValidator(
 					'attachments',
-					(form) => form.get('isInclude')?.value && form.get('isRequestDogAuthorization')?.value === BooleanTypeCode.Yes
+					(form) => form.get('useDogs')?.value == this.booleanTypeCodes.Yes
 				),
+				FormGroupValidators.atLeastOneCheckboxWhenReqdValidator('dogsPurposeFormGroup', 'useDogs', BooleanTypeCode.Yes),
 			],
 		}
 	);
@@ -422,7 +425,7 @@ export abstract class BusinessApplicationHelper extends ApplicationHelper {
 
 		if (categoryData.SecurityGuard) {
 			const useDogs = this.utilService.booleanTypeToBoolean(
-				businessModelFormValue.categorySecurityGuardFormGroup.isRequestDogAuthorization
+				businessModelFormValue.categorySecurityGuardFormGroup.useDogs
 			);
 			if (useDogs) {
 				if (businessModelFormValue.categorySecurityGuardFormGroup.attachments) {
@@ -466,7 +469,7 @@ export abstract class BusinessApplicationHelper extends ApplicationHelper {
 		const bizTypeCode = businessModelFormValue.businessInformationData.bizTypeCode;
 
 		let privateInvestigatorSwlInfo: SwlContactInfo = {};
-		let useDogs: boolean | null = null;
+		let dogsAuthorizationData = {};
 
 		const categoryCodes = this.getSaveBodyCategoryCodes(businessModelFormValue.categoryData);
 		const documentInfos = this.getSaveBodyDocumentInfos(businessModelFormValue);
@@ -492,9 +495,18 @@ export abstract class BusinessApplicationHelper extends ApplicationHelper {
 		const categoryData = { ...businessModelFormValue.categoryData };
 
 		if (categoryData.SecurityGuard) {
-			useDogs = this.utilService.booleanTypeToBoolean(
-				businessModelFormValue.categorySecurityGuardFormGroup.isRequestDogAuthorization
-			);
+			const categorySecurityGuardFormGroup = businessModelFormValue.categorySecurityGuardFormGroup.dogsPurposeFormGroup;
+			const isDetectionDrugs = categorySecurityGuardFormGroup.isDogsPurposeDetectionDrugs ?? false;
+			const isDetectionExplosives = categorySecurityGuardFormGroup.isDogsPurposeDetectionExplosives ?? false;
+			const isProtection = categorySecurityGuardFormGroup.isDogsPurposeProtection ?? false;
+			const useDogs = this.utilService.booleanTypeToBoolean(categorySecurityGuardFormGroup.useDogs);
+
+			dogsAuthorizationData = {
+				useDogs,
+				isDogsPurposeDetectionDrugs: useDogs ? isDetectionDrugs : null,
+				isDogsPurposeDetectionExplosives: useDogs ? isDetectionExplosives : null,
+				isDogsPurposeProtection: useDogs ? isProtection : null,
+			};
 		}
 
 		if (categoryData.PrivateInvestigator) {
@@ -533,10 +545,10 @@ export abstract class BusinessApplicationHelper extends ApplicationHelper {
 			originalApplicationId: originalLicenceData ? originalLicenceData.originalApplicationId : null,
 			originalLicenceId: originalLicenceData ? originalLicenceData.originalLicenceId : null,
 			//-----------------------------------
-			categoryCodes: [...categoryCodes],
-			documentInfos: [...documentInfos],
+			categoryCodes,
+			documentInfos,
 			privateInvestigatorSwlInfo,
-			useDogs,
+			dogsAuthorizationData,
 		};
 
 		console.debug('[getSaveBodyBase] body returned', body);
@@ -635,7 +647,7 @@ export abstract class BusinessApplicationHelper extends ApplicationHelper {
 
 		if (categoryData.SecurityGuard) {
 			const useDogs = this.utilService.booleanTypeToBoolean(
-				businessModelFormValue.categorySecurityGuardFormGroup.isRequestDogAuthorization
+				businessModelFormValue.categorySecurityGuardFormGroup.useDogs
 			);
 			if (useDogs) {
 				if (businessModelFormValue.categorySecurityGuardFormGroup.attachments) {
@@ -681,7 +693,7 @@ export abstract class BusinessApplicationHelper extends ApplicationHelper {
 		return applicationTypeCode === ApplicationTypeCode.Update;
 	}
 
-	clearPrivateInvestigatorModelData(): void {
+	private clearPrivateInvestigatorModelData(): void {
 		// clear out any old data
 		this.categoryPrivateInvestigatorFormGroup.patchValue(
 			{
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/business-application.service.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/business-application.service.ts
index 4104ced90..d6daa367e 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/business-application.service.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/business-application.service.ts
@@ -1633,7 +1633,13 @@ export class BusinessApplicationService extends BusinessApplicationHelper {
 		if (categoryData.SecurityGuard) {
 			categorySecurityGuardFormGroup = {
 				isInclude: true,
-				isRequestDogAuthorization: this.utilService.booleanToBooleanType(businessLicenceAppl.useDogs),
+				useDogs: this.utilService.booleanToBooleanType(businessLicenceAppl.useDogs),
+				dogsPurposeFormGroup: {
+					isDogsPurposeDetectionDrugs: null, //businessLicenceAppl.isDogsPurposeDetectionDrugs,
+					isDogsPurposeDetectionExplosives: null, //businessLicenceAppl.isDogsPurposeDetectionExplosives,
+					isDogsPurposeProtection: null, //businessLicenceAppl.isDogsPurposeProtection,
+					// TODO populate dog info
+				},
 				attachments: dogAuthorizationAttachments,
 			};
 		}
@@ -1850,7 +1856,12 @@ export class BusinessApplicationService extends BusinessApplicationHelper {
 				if (categoryData.SecurityGuard) {
 					categorySecurityGuardFormGroup = {
 						isInclude: true,
-						isRequestDogAuthorization: null,
+						useDogs: null,
+						dogsPurposeFormGroup: {
+							isDogsPurposeDetectionDrugs: null,
+							isDogsPurposeDetectionExplosives: null,
+							isDogsPurposeProtection: null,
+						},
 						attachments: [],
 					};
 				}
@@ -1904,7 +1915,12 @@ export class BusinessApplicationService extends BusinessApplicationHelper {
 				if (categoryData.SecurityGuard) {
 					categorySecurityGuardFormGroup = {
 						isInclude: true,
-						isRequestDogAuthorization: null,
+						useDogs: null,
+						dogsPurposeFormGroup: {
+							isDogsPurposeDetectionDrugs: null,
+							isDogsPurposeDetectionExplosives: null,
+							isDogsPurposeProtection: null,
+						},
 						attachments: [],
 					};
 				}
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/permit-application.service.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/permit-application.service.ts
index b4ddc611c..0a8e53ca2 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/permit-application.service.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/permit-application.service.ts
@@ -26,7 +26,7 @@ import { BooleanTypeCode } from '@app/core/code-types/model-desc.models';
 import { AuthenticationService } from '@app/core/services/authentication.service';
 import { FileUtilService, SpdFile } from '@app/core/services/file-util.service';
 import { FormControlValidators } from '@app/core/validators/form-control.validators';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { OptionsPipe } from '@app/shared/pipes/options.pipe';
 import { HotToastService } from '@ngxpert/hot-toast';
 import moment from 'moment';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/worker-application.helper.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/worker-application.helper.ts
index 223e6f953..bfb1c5cd6 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/worker-application.helper.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/worker-application.helper.ts
@@ -1221,10 +1221,8 @@ export abstract class WorkerApplicationHelper extends ApplicationHelper {
 	}
 
 	getSummaryshowPhotographOfYourself(workerLicenceModelData: any): boolean {
-		return (
-			this.getSummaryhasGenderChanged(workerLicenceModelData) &&
-			this.getSummaryphotoOfYourselfAttachments(workerLicenceModelData).length > 0
-		);
+		const att = this.getSummaryphotoOfYourselfAttachments(workerLicenceModelData);
+		return this.getSummaryhasGenderChanged(workerLicenceModelData) && !!att && att.length > 0;
 	}
 
 	getSummaryhasBcscNameChanged(workerLicenceModelData: any): boolean {
@@ -1489,14 +1487,14 @@ export abstract class WorkerApplicationHelper extends ApplicationHelper {
 		return workerLicenceModelData.characteristicsData.weightUnitCode ?? '';
 	}
 
-	getSummaryphotoOfYourselfAttachments(workerLicenceModelData: any): File[] {
+	getSummaryphotoOfYourselfAttachments(workerLicenceModelData: any): File[] | null {
 		const applicationTypeCode = this.getSummaryapplicationTypeCode(workerLicenceModelData);
 		if (applicationTypeCode === ApplicationTypeCode.New) {
-			return workerLicenceModelData.photographOfYourselfData.attachments ?? [];
+			return workerLicenceModelData.photographOfYourselfData.attachments ?? null;
 		} else {
 			const updatePhoto = workerLicenceModelData.photographOfYourselfData.updatePhoto === BooleanTypeCode.Yes;
-			const updateAttachments = workerLicenceModelData.photographOfYourselfData.updateAttachments ?? [];
-			return updatePhoto ? updateAttachments : [];
+			const updateAttachments = workerLicenceModelData.photographOfYourselfData.updateAttachments ?? null;
+			return updatePhoto ? updateAttachments : null;
 		}
 	}
 
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/worker-application.service.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/worker-application.service.ts
index f47c23b23..ee63587ae 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/worker-application.service.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/core/services/worker-application.service.ts
@@ -26,7 +26,7 @@ import { StrictHttpResponse } from '@app/api/strict-http-response';
 import { BooleanTypeCode } from '@app/core/code-types/model-desc.models';
 import { SPD_CONSTANTS } from '@app/core/constants/constants';
 import { FormControlValidators } from '@app/core/validators/form-control.validators';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { FileUploadComponent } from '@app/shared/components/file-upload.component';
 import { FormatDatePipe } from '@app/shared/pipes/format-date.pipe';
 import { HotToastService } from '@ngxpert/hot-toast';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/landing.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/landing.component.ts
index 4cd12b851..bf8235312 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/landing.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/landing.component.ts
@@ -1,6 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
+import { BusinessLicenceApplicationRoutes } from '@app/modules/business-licence-application/business-license-application-routes';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { PermitApplicationService } from '@core/services/permit-application.service';
 import { take, tap } from 'rxjs';
 import { WorkerLicenceTypeCode } from './api/models';
@@ -8,8 +10,6 @@ import { SPD_CONSTANTS } from './core/constants/constants';
 import { ApplicationService } from './core/services/application.service';
 import { AuthProcessService } from './core/services/auth-process.service';
 import { WorkerApplicationService } from './core/services/worker-application.service';
-import { BusinessLicenceApplicationRoutes } from '@app/modules/business-licence-application/business-license-application-routes';
-import { PersonalLicenceApplicationRoutes } from './modules/personal-licence-application/personal-licence-application-routing.module';
 import { DialogComponent, DialogOptions } from './shared/components/dialog.component';
 
 @Component({
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/business-license-application-routes.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/business-license-application-routes.ts
index 1b94726b6..460743562 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/business-license-application-routes.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/business-license-application-routes.ts
@@ -1,4 +1,3 @@
-
 export class BusinessLicenceApplicationRoutes {
 	public static readonly BUSINESS_LICENCE_APPLICATION = 'business-licence';
 
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-category-security-guard.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-category-security-guard.component.ts
index 67d414044..ca15582f5 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-category-security-guard.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-category-security-guard.component.ts
@@ -16,7 +16,7 @@ import { FileUploadComponent } from '@app/shared/components/file-upload.componen
 					Do you want to request authorization to use dogs for the purpose of security work?
 				</div>
 				<div class="col-xxl-2 col-xl-3 col-lg-4 col-md-6 col-sm-12">
-					<mat-radio-group aria-label="Select an option" formControlName="isRequestDogAuthorization">
+					<mat-radio-group aria-label="Select an option" formControlName="useDogs">
 						<div class="d-flex justify-content-start">
 							<mat-radio-button class="radio-label" [value]="booleanTypeCodes.No">No</mat-radio-button>
 							<mat-radio-button class="radio-label" [value]="booleanTypeCodes.Yes">Yes</mat-radio-button>
@@ -25,35 +25,61 @@ import { FileUploadComponent } from '@app/shared/components/file-upload.componen
 					<mat-error
 						class="mat-option-error"
 						*ngIf="
-							(form.get('isRequestDogAuthorization')?.dirty || form.get('isRequestDogAuthorization')?.touched) &&
-							form.get('isRequestDogAuthorization')?.invalid &&
-							form.get('isRequestDogAuthorization')?.hasError('required')
+							(form.get('useDogs')?.dirty || form.get('useDogs')?.touched) &&
+							form.get('useDogs')?.invalid &&
+							form.get('useDogs')?.hasError('required')
 						"
 						>This is required</mat-error
 					>
 				</div>
 			</div>
 
-			<div class="my-4" *ngIf="isRequestDogAuthorization.value === booleanTypeCodes.Yes" @showHideTriggerSlideAnimation>
-				<mat-divider class="mb-3 mat-divider-primary"></mat-divider>
+			<div class="row" *ngIf="useDogs.value === booleanTypeCodes.Yes" @showHideTriggerSlideAnimation>
+				<mat-divider class="mb-3 mt-4 mat-divider-primary"></mat-divider>
 
-				<div class="text-minor-heading mb-2">Upload your Security Dog Validation Certificate</div>
-				<app-file-upload
-					(fileUploaded)="onFileUploaded($event)"
-					(fileRemoved)="onFileRemoved()"
-					[control]="attachments"
-					[maxNumberOfFiles]="1"
-					[files]="attachments.value"
-				></app-file-upload>
-				<mat-error
-					class="mat-option-error"
-					*ngIf="
-						(form.get('attachments')?.dirty || form.get('attachments')?.touched) &&
-						form.get('attachments')?.invalid &&
-						form.get('attachments')?.hasError('required')
-					"
-					>This is required</mat-error
-				>
+				<div class="row mt-2 mb-4">
+					<div class="col-12">
+						<div class="form-group" formGroupName="dogsPurposeFormGroup">
+							<div class="text-minor-heading mb-2">Purpose of using dogs</div>
+							<mat-checkbox formControlName="isDogsPurposeProtection"> Protection </mat-checkbox>
+							<mat-checkbox formControlName="isDogsPurposeDetectionDrugs"> Detection - Drugs </mat-checkbox>
+							<mat-checkbox formControlName="isDogsPurposeDetectionExplosives"> Detection - Explosives </mat-checkbox>
+						</div>
+						<mat-error
+							class="mat-option-error"
+							*ngIf="
+								(form.get('dogsPurposeFormGroup')?.dirty || form.get('dogsPurposeFormGroup')?.touched) &&
+								form.hasError('atLeastOneCheckboxWhenReqd')
+							"
+							>At least one option must be selected</mat-error
+						>
+					</div>
+				</div>
+
+				<div class="text-minor-heading my-2">Upload your Security Dog Validation Certificate</div>
+				<div class="mb-2">
+					<mat-icon style="vertical-align: bottom;">emergency</mat-icon> If you have more than one dog, you must submit
+					a certificate for each dog
+				</div>
+
+				<div class="my-2">
+					<app-file-upload
+						(fileUploaded)="onFileUploaded($event)"
+						(fileRemoved)="onFileRemoved()"
+						[control]="attachments"
+						[maxNumberOfFiles]="10"
+						[files]="attachments.value"
+					></app-file-upload>
+					<mat-error
+						class="mat-option-error"
+						*ngIf="
+							(form.get('attachments')?.dirty || form.get('attachments')?.touched) &&
+							form.get('attachments')?.invalid &&
+							form.get('attachments')?.hasError('required')
+						"
+						>This is required</mat-error
+					>
+				</div>
 			</div>
 		</form>
 	`,
@@ -100,8 +126,8 @@ export class BusinessCategorySecurityGuardComponent implements LicenceChildStepp
 		this.businessApplicationService.hasValueChanged = true;
 	}
 
-	get isRequestDogAuthorization(): FormControl {
-		return this.form.get('isRequestDogAuthorization') as FormControl;
+	get useDogs(): FormControl {
+		return this.form.get('useDogs') as FormControl;
 	}
 	get attachments(): FormControl {
 		return this.form.get('attachments') as FormControl;
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-list-current.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-list-current.component.ts
index 8208192b5..afedc0784 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-list-current.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-list-current.component.ts
@@ -22,14 +22,22 @@ import { MainLicenceResponse } from '@app/core/services/application.service';
 					</div>
 					<div class="col-lg-10">
 						<div class="row">
-							<div class="col-lg-5">
+							<div class="col-lg-3">
 								<div class="d-block text-muted mt-2 mt-md-0">Licence Number</div>
-								<div class="text-data">{{ licence.licenceNumber }}</div>
+								<div class="text-data fw-bold">{{ licence.licenceNumber }}</div>
 							</div>
-							<div class="col-lg-4">
+							<div class="col-lg-3">
 								<div class="d-block text-muted mt-2 mt-md-0">Licence Term</div>
 								<div class="text-data">{{ licence.licenceTermCode | options : 'LicenceTermTypes' }}</div>
 							</div>
+							<div class="col-lg-3">
+								<div class="d-block text-muted mt-2 mt-md-0">Expiry Date</div>
+								<div class="text-data">
+									<div class="text-data" [ngClass]="licence.isRenewalPeriod ? 'error-color' : ''">
+										{{ licence.licenceExpiryDate | formatDate : constants.date.formalDateFormat }}
+									</div>
+								</div>
+							</div>
 							<div class="col-lg-3 text-end">
 								<mat-chip-option [selectable]="false" class="appl-chip-option mat-chip-green">
 									<mat-icon class="appl-chip-option-item">check_circle</mat-icon>
@@ -40,13 +48,7 @@ import { MainLicenceResponse } from '@app/core/services/application.service';
 						</div>
 
 						<div class="row mb-2">
-							<div class="col-lg-3">
-								<div class="d-block text-muted mt-2 mt-md-0">Expiry Date</div>
-								<div class="text-data">
-									{{ licence.licenceExpiryDate | formatDate : constants.date.formalDateFormat }}
-								</div>
-							</div>
-							<div class="col-lg-5">
+							<div class="col-lg-6">
 								<div class="d-block text-muted mt-2 mt-md-0">Licence Categories</div>
 								<div class="text-data">
 									<ul class="m-0">
@@ -57,10 +59,10 @@ import { MainLicenceResponse } from '@app/core/services/application.service';
 								</div>
 							</div>
 							<ng-container *ngIf="licence.hasSecurityGuardCategory">
-								<div class="col-lg-4">
+								<div class="col-lg-6">
 									<div class="d-block text-muted mt-2">Dog Authorization</div>
 									<div class="text-data">
-										<ng-container *ngIf="licence.dogAuthorization; noDogAuthorization">
+										<ng-container *ngIf="licence.dogAuthorization; else noDogAuthorization">
 											Authorized to use dogs
 										</ng-container>
 										<ng-template #noDogAuthorization> Not authorized to use dogs </ng-template>
@@ -147,6 +149,11 @@ import { MainLicenceResponse } from '@app/core/services/application.service';
 			.appl-chip-option-item {
 				vertical-align: text-bottom;
 			}
+
+			.error-color {
+				font-weight: 600;
+				color: var(--color-red-dark);
+			}
 		`,
 	],
 })
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-new-swl-sole-proprietor.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-new-swl-sole-proprietor.component.ts
index 671662c74..492aef4bd 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-new-swl-sole-proprietor.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-new-swl-sole-proprietor.component.ts
@@ -10,7 +10,7 @@ import { BaseWizardComponent } from '@app/core/components/base-wizard.component'
 import { ApplicationService } from '@app/core/services/application.service';
 import { BusinessApplicationService } from '@app/core/services/business-application.service';
 import { BusinessLicenceApplicationRoutes } from '@app/modules/business-licence-application/business-license-application-routes';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { HotToastService } from '@ngxpert/hot-toast';
 import { Subscription, distinctUntilChanged } from 'rxjs';
 import { StepsBusinessLicenceReviewComponent } from './steps-business-licence-review.component';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-replacement.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-replacement.component.ts
index f7bef1d31..7e4ba6741 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-replacement.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-replacement.component.ts
@@ -20,7 +20,9 @@ import { distinctUntilChanged } from 'rxjs';
 				>
 					<mat-step completed="true">
 						<ng-template matStepLabel>Licence Confirmation</ng-template>
-						<app-step-business-licence-confirmation></app-step-business-licence-confirmation>
+						<app-step-business-licence-confirmation
+							[applicationTypeCode]="applicationTypeReplace"
+						></app-step-business-licence-confirmation>
 
 						<app-wizard-footer
 							nextButtonLabel="Pay Now"
@@ -39,6 +41,8 @@ import { distinctUntilChanged } from 'rxjs';
 	styles: [],
 })
 export class BusinessLicenceWizardReplacementComponent extends BaseWizardComponent implements OnInit {
+	applicationTypeReplace = ApplicationTypeCode.Replacement;
+
 	constructor(
 		override breakpointObserver: BreakpointObserver,
 		private commonApplicationService: ApplicationService,
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-update.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-update.component.ts
index 65c9ab807..5f563c066 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-update.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-licence-wizard-update.component.ts
@@ -29,7 +29,9 @@ import { StepsBusinessLicenceUpdatesComponent } from './steps-business-licence-u
 				>
 					<mat-step completed="true">
 						<ng-template matStepLabel>Licence Confirmation</ng-template>
-						<app-step-business-licence-confirmation></app-step-business-licence-confirmation>
+						<app-step-business-licence-confirmation
+							[applicationTypeCode]="applicationTypeUpdate"
+						></app-step-business-licence-confirmation>
 
 						<app-wizard-footer
 							(previousStepperStep)="onGotoBusinessProfile()"
@@ -73,6 +75,7 @@ import { StepsBusinessLicenceUpdatesComponent } from './steps-business-licence-u
 	styles: [],
 })
 export class BusinessLicenceWizardUpdateComponent extends BaseWizardComponent implements OnInit, OnDestroy {
+	applicationTypeUpdate = ApplicationTypeCode.Update;
 	newLicenceCost = 0;
 
 	readonly STEP_LICENCE_CONFIRMATION = 0; // needs to be zero based because 'selectedIndex' is zero based
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-user-applications.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-user-applications.component.ts
index bc0d1163f..4a368274d 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-user-applications.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/business-user-applications.component.ts
@@ -111,18 +111,7 @@ import { Observable, forkJoin, switchMap, take, tap } from 'rxjs';
 			</div>
 		</section>
 	`,
-	styles: [
-		`
-			.appl-chip-option {
-				height: 35px;
-				width: 125px;
-			}
-
-			.appl-chip-option-item {
-				vertical-align: text-bottom;
-			}
-		`,
-	],
+	styles: [],
 })
 export class BusinessUserApplicationsComponent implements OnInit {
 	constants = SPD_CONSTANTS;
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/common-business-licence-summary.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/common-business-licence-summary.component.ts
index 202566d24..f5baabe66 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/common-business-licence-summary.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/common-business-licence-summary.component.ts
@@ -152,14 +152,13 @@ import { BooleanTypeCode } from 'src/app/core/code-types/model-desc.models';
 
 								<div class="panel-body">
 									<div class="text-minor-heading mt-4">Licence Information</div>
-
 									<div class="row mt-0">
 										<ng-container *ngIf="!isStaticDataView && !isUpdate">
-											<div class="col-lg-4 col-md-12">
+											<div class="col-lg-3 col-md-12">
 												<div class="text-label d-block text-muted">Licence Term</div>
 												<div class="summary-text-data">{{ licenceTermCode | options : 'LicenceTermTypes' }}</div>
 											</div>
-											<div class="col-lg-4 col-md-12">
+											<div class="col-lg-3 col-md-12">
 												<div class="text-label d-block text-muted">Fee</div>
 												<div class="summary-text-data">
 													{{ licenceFee | currency : 'CAD' : 'symbol-narrow' : '1.0' | default }}
@@ -167,18 +166,16 @@ import { BooleanTypeCode } from 'src/app/core/code-types/model-desc.models';
 											</div>
 										</ng-container>
 
-										<ng-container
-											*ngFor="let category of categoryList; let i = index; let first = first; let last = last"
-										>
-											<div class="col-lg-4 col-md-12">
-												<div class="text-label d-block text-muted">
-													Licence Category <span *ngIf="categoryList.length > 1"> #{{ i + 1 }}</span>
-												</div>
-												<div class="summary-text-data">
-													{{ category | options : 'WorkerCategoryTypes' }}
-												</div>
+										<div class="col-lg-6 col-md-12">
+											<div class="text-label d-block text-muted">Licence Categories</div>
+											<div class="summary-text-data">
+												<ul class="m-0">
+													<ng-container *ngFor="let category of categoryList; let i = index">
+														<li>{{ category | options : 'WorkerCategoryTypes' }}</li>
+													</ng-container>
+												</ul>
 											</div>
-										</ng-container>
+										</div>
 
 										<ng-container *ngIf="isAnyDocuments">
 											<mat-divider class="mt-3 mb-2"></mat-divider>
@@ -312,7 +309,7 @@ import { BooleanTypeCode } from 'src/app/core/code-types/model-desc.models';
 										<div class="text-minor-heading mt-4">Active Security Worker Licence Holders</div>
 										<div class="row mt-0">
 											<ng-container *ngIf="membersWithSwlList.length > 0; else NoMembersWithSwlList">
-												<ng-container *ngFor="let member of membersWithSwlList; let i = index">
+												<!-- <ng-container *ngFor="let member of membersWithSwlList; let i = index">
 													<div class="col-lg-4 col-md-12">
 														<div class="text-label d-block text-muted">
 															Member <span *ngIf="membersWithSwlList.length > 1"> #{{ i + 1 }}</span>
@@ -320,8 +317,20 @@ import { BooleanTypeCode } from 'src/app/core/code-types/model-desc.models';
 														<div class="summary-text-data">
 															{{ member.licenceHolderName }} - {{ member.licenceNumber }}
 														</div>
+													</div> -->
+
+												<div class="col-xl-4 col-lg-6 col-md-12">
+													<div class="text-label d-block text-muted">Members</div>
+													<div class="summary-text-data">
+														<ul class="m-0">
+															<ng-container *ngFor="let member of membersWithSwlList; let i = index">
+																<li>{{ member.licenceHolderName }} - {{ member.licenceNumber }}</li>
+															</ng-container>
+														</ul>
 													</div>
-												</ng-container>
+												</div>
+
+												<!-- </ng-container> -->
 											</ng-container>
 											<ng-template #NoMembersWithSwlList> <div class="col-12">None</div> </ng-template>
 										</div>
@@ -330,7 +339,7 @@ import { BooleanTypeCode } from 'src/app/core/code-types/model-desc.models';
 										<div class="text-minor-heading">Members who require Criminal Record Checks</div>
 										<div class="row mt-0">
 											<ng-container *ngIf="membersWithoutSwlList.length > 0; else NoMembersWithoutSwlList">
-												<ng-container *ngFor="let member of membersWithoutSwlList; let i = index">
+												<!-- <ng-container *ngFor="let member of membersWithoutSwlList; let i = index">
 													<div class="col-lg-4 col-md-12">
 														<div class="text-label d-block text-muted">
 															Member <span *ngIf="membersWithoutSwlList.length > 1"> #{{ i + 1 }}</span>
@@ -339,7 +348,18 @@ import { BooleanTypeCode } from 'src/app/core/code-types/model-desc.models';
 															{{ member.licenceHolderName }}
 														</div>
 													</div>
-												</ng-container>
+												</ng-container> -->
+
+												<div class="col-xl-4 col-lg-6 col-md-12">
+													<div class="text-label d-block text-muted">Members</div>
+													<div class="summary-text-data">
+														<ul class="m-0">
+															<ng-container *ngFor="let member of membersWithoutSwlList; let i = index">
+																<li>{{ member.licenceHolderName }}</li>
+															</ng-container>
+														</ul>
+													</div>
+												</div>
 											</ng-container>
 											<ng-template #NoMembersWithoutSwlList> <div class="col-12">None</div></ng-template>
 										</div>
@@ -534,9 +554,7 @@ export class CommonBusinessLicenceSummaryComponent implements OnInit {
 	}
 	get showSecurityGuard(): boolean {
 		const isInclude = this.businessModelData.categorySecurityGuardData?.isInclude ?? false;
-		return (
-			isInclude && this.businessModelData.categorySecurityGuardData?.isRequestDogAuthorization === BooleanTypeCode.Yes
-		);
+		return isInclude && this.businessModelData.categorySecurityGuardData?.useDogs === BooleanTypeCode.Yes;
 	}
 	get categoryArmouredCarGuardAttachments(): File[] {
 		return this.businessModelData.categoryArmouredCarGuardData.attachments ?? [];
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/common-business-profile.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/common-business-profile.component.ts
index 22b769c0e..3db71be85 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/common-business-profile.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/common-business-profile.component.ts
@@ -63,11 +63,7 @@ import { BusinessBcBranchesComponent } from './business-bc-branches.component';
 									<a href="https://www.bceid.ca" target="_blank">visit BCeID</a>.
 								</div>
 
-								<app-address
-									[form]="businessMailingAddressFormGroup"
-									[isWizardStep]="false"
-									[isReadonly]="true"
-								></app-address>
+								<app-address [form]="businessMailingAddressFormGroup" [isReadonly]="true"></app-address>
 							</div>
 						</mat-expansion-panel>
 					</mat-accordion>
@@ -89,7 +85,6 @@ import { BusinessBcBranchesComponent } from './business-bc-branches.component';
 
 								<app-address-and-is-same-flag
 									[form]="businessAddressFormGroup"
-									[isWizardStep]="false"
 									[isReadonly]="isReadonly"
 									[isCheckboxReadOnly]="isReadonly"
 									isAddressTheSameLabel="The business address and mailing address are the same"
@@ -100,7 +95,7 @@ import { BusinessBcBranchesComponent } from './business-bc-branches.component';
 				</section>
 			</div>
 
-			<div class="col-lg-6 col-md-12" *ngIf="!showBcBusinessAddress">
+			<div class="col-12" *ngIf="!showBcBusinessAddress">
 				<section>
 					<mat-accordion>
 						<mat-expansion-panel class="mat-expansion-panel-border mb-3" [expanded]="true" [disabled]="true">
@@ -115,7 +110,7 @@ import { BusinessBcBranchesComponent } from './business-bc-branches.component';
 
 								<app-address
 									[form]="bcBusinessAddressFormGroup"
-									[isWizardStep]="false"
+									[isWideView]="true"
 									[isReadonly]="isReadonly"
 								></app-address>
 							</div>
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/modal-bc-branch-edit.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/modal-bc-branch-edit.component.ts
index 87da73c21..2677d568e 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/modal-bc-branch-edit.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/modal-bc-branch-edit.component.ts
@@ -56,7 +56,7 @@ export interface UserDialogData {
 			</form>
 
 			<div class="text-minor-heading my-2">Branch Address</div>
-			<app-address [form]="form" [isWizardStep]="false"></app-address>
+			<app-address [form]="form" [isWideView]="true"></app-address>
 		</mat-dialog-content>
 		<mat-dialog-actions>
 			<div class="row m-0 w-100">
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-business-address.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-business-address.component.ts
index acae6fdf1..cc782fe7c 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-business-address.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-business-address.component.ts
@@ -21,11 +21,7 @@ import { LicenceChildStepperStepComponent } from '@app/core/services/util.servic
 										<a href="https://www.bceid.ca" target="_blank">visit BCeID</a>.
 									</div>
 
-									<app-address
-										[form]="businessMailingAddressFormGroup"
-										[isWizardStep]="false"
-										[isReadonly]="true"
-									></app-address>
+									<app-address [form]="businessMailingAddressFormGroup" [isReadonly]="true"></app-address>
 								</div>
 							</mat-expansion-panel>
 						</mat-accordion>
@@ -47,7 +43,6 @@ import { LicenceChildStepperStepComponent } from '@app/core/services/util.servic
 
 									<app-address-and-is-same-flag
 										[form]="businessAddressFormGroup"
-										[isWizardStep]="false"
 										isAddressTheSameLabel="The business address and mailing address are the same"
 									></app-address-and-is-same-flag>
 								</div>
@@ -56,7 +51,7 @@ import { LicenceChildStepperStepComponent } from '@app/core/services/util.servic
 					</section>
 				</div>
 
-				<div class="col-lg-6 col-md-12" *ngIf="!showBcBusinessAddress">
+				<div class="col-12" *ngIf="!showBcBusinessAddress">
 					<section>
 						<mat-accordion>
 							<mat-expansion-panel class="mat-expansion-panel-border mb-3" [expanded]="true" [disabled]="true">
@@ -69,7 +64,7 @@ import { LicenceChildStepperStepComponent } from '@app/core/services/util.servic
 										Provide an address in British Columbia for document service
 									</app-alert>
 
-									<app-address [form]="bcBusinessAddressFormGroup" [isWizardStep]="false"></app-address>
+									<app-address [form]="bcBusinessAddressFormGroup" [isWideView]="true"></app-address>
 								</div>
 							</mat-expansion-panel>
 						</mat-accordion>
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-category.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-category.component.ts
index 8fb9fa20a..c8fa9b343 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-category.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-category.component.ts
@@ -38,14 +38,14 @@ import { FileUploadComponent } from '@app/shared/components/file-upload.componen
 						</div>
 
 						<div class="mt-2" *ngIf="showLocksmithMessage">
-							<app-alert type="info" icon="">
+							<app-alert type="success" icon="">
 								The <strong>Locksmith</strong> business licence automatically includes Electronic Locking Device
 								Installer.
 							</app-alert>
 						</div>
 
 						<div class="mt-2" *ngIf="showSecurityAlarmInstallerMessage">
-							<app-alert type="info" icon="">
+							<app-alert type="success" icon="">
 								The <strong>Security Alarm Installer</strong> business licence automatically includes Security Alarm
 								Sales, Security Alarm Monitor, Security Alarm Response, Closed Circuit Television Installer, and
 								Electronic Locking Device Installer.
@@ -53,14 +53,14 @@ import { FileUploadComponent } from '@app/shared/components/file-upload.componen
 						</div>
 
 						<div class="mt-2" *ngIf="showSecurityAlarmResponseMessage">
-							<app-alert type="info" icon="">
+							<app-alert type="success" icon="">
 								The <strong>Security Alarm Response</strong> business licence automatically includes Security Alarm
 								Monitor.
 							</app-alert>
 						</div>
 
 						<div class="mt-2" *ngIf="showSecurityGuardMessage">
-							<app-alert type="info" icon="">
+							<app-alert type="success" icon="">
 								The <strong>Security Guard</strong> business licence automatically includes Security Alarm Monitor and
 								Security Alarm Response.
 							</app-alert>
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-confirmation.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-confirmation.component.ts
index 2c39fc353..110f6d422 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-confirmation.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-confirmation.component.ts
@@ -20,40 +20,40 @@ import { BusinessApplicationService } from '@app/core/services/business-applicat
 			<div class="row">
 				<div class="col-xl-7 col-lg-12 col-md-12 col-sm-12 mx-auto">
 					<div class="row mt-0 mb-3">
-						<div class="col-lg-6 col-md-12">
+						<div class="col-lg-4 col-md-12">
 							<div class="text-label d-block text-muted">Business Name</div>
 							<div class="summary-text-data">{{ businessName }}</div>
 						</div>
-						<div class="col-lg-6 col-md-12">
+						<div class="col-lg-4 col-md-12">
 							<div class="text-label d-block text-muted">Business Licence Number</div>
 							<div class="summary-text-data">{{ originalLicenceNumber }}</div>
 						</div>
-						<div class="col-lg-6 col-md-12">
-							<div class="text-label d-block text-muted">Licence Categories</div>
-							<div class="summary-text-data">
-								<ul class="m-0">
-									<ng-container *ngFor="let catCode of categoryData; let i = index">
-										<li>{{ catCode | options : 'WorkerCategoryTypes' }}</li>
-									</ng-container>
-								</ul>
-							</div>
+						<div class="col-lg-4 col-md-12">
+							<div class="text-label d-block text-muted">Licence Term</div>
+							<div class="summary-text-data">{{ originalLicenceTermCode | options : 'LicenceTermTypes' }}</div>
 						</div>
-						<div class="col-lg-6 col-md-12">
+						<div class="col-lg-4 col-md-12">
 							<div class="text-label d-block text-muted">Expiry Date</div>
 							<div class="summary-text-data">
 								{{ originalExpiryDate | formatDate : formalDateFormat }}
 							</div>
 						</div>
-						<div class="col-lg-6 col-md-12">
-							<div class="text-label d-block text-muted">Licence Term</div>
-							<div class="summary-text-data">{{ originalLicenceTermCode | options : 'LicenceTermTypes' }}</div>
-						</div>
-						<div class="col-lg-6 col-md-12" *ngIf="feeAmount">
+						<div class="col-lg-4 col-md-12" *ngIf="feeAmount">
 							<div class="text-label d-block text-muted">{{ applicationTypeCode }} Fee</div>
 							<div class="summary-text-data">
 								{{ feeAmount | currency : 'CAD' : 'symbol-narrow' : '1.0' | default }}
 							</div>
 						</div>
+						<div class="col-md-12" [ngClass]="feeAmount ? 'col-lg-4' : 'col-lg-8'">
+							<div class="text-label d-block text-muted">Licence Categories</div>
+							<div class="summary-text-data">
+								<ul class="m-0">
+									<ng-container *ngFor="let catCode of categoryData; let i = index">
+										<li>{{ catCode | options : 'WorkerCategoryTypes' }}</li>
+									</ng-container>
+								</ul>
+							</div>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -79,6 +79,7 @@ export class StepBusinessLicenceConfirmationComponent implements OnInit {
 		this.businessLicenceModelData = { ...this.businessApplicationService.businessModelFormGroup.getRawValue() };
 
 		// only show fee for Replacement flow
+
 		if (this.applicationTypeCode === ApplicationTypeCode.Replacement) {
 			const workerLicenceTypeCode = this.businessLicenceModelData.workerLicenceTypeData?.workerLicenceTypeCode;
 			const originalLicenceData = this.businessLicenceModelData.originalLicenceData;
@@ -119,6 +120,6 @@ export class StepBusinessLicenceConfirmationComponent implements OnInit {
 		const selected = workerCategoryTypeCodes.filter((item: string) => {
 			return !!categoryData[item];
 		});
-		return selected ?? [];
+		return selected.sort() ?? [];
 	}
 }
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-expired.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-expired.component.ts
index c0e117782..97dcf78d7 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-expired.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/step-business-licence-expired.component.ts
@@ -7,10 +7,15 @@ import { LicenceChildStepperStepComponent } from '@app/core/services/util.servic
 @Component({
 	selector: 'app-step-business-licence-expired',
 	template: `
-		<app-step-section
-			title="Does your business have an expired licence in BC?"
-			subtitle="Processing time will be reduced if you provide info from your past licence"
-		>
+		<app-step-section title="Does your business have an expired licence in BC?">
+			<div class="row">
+				<div class="offset-md-2 col-md-8 col-sm-12">
+					<app-alert type="info" icon="info">
+						Processing time will be reduced if you provide info from your past licence
+					</app-alert>
+				</div>
+			</div>
+
 			<app-expired-licence
 				[form]="form"
 				[isLoggedIn]="true"
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/steps-business-licence-information.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/steps-business-licence-information.component.ts
index ace8a16af..aae9dcafa 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/steps-business-licence-information.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/steps-business-licence-information.component.ts
@@ -32,7 +32,9 @@ import { StepBusinessLicenceLiabilityComponent } from './step-business-licence-l
 			</mat-step>
 
 			<mat-step *ngIf="isRenewalOrUpdate">
-				<app-step-business-licence-confirmation></app-step-business-licence-confirmation>
+				<app-step-business-licence-confirmation
+					[applicationTypeCode]="applicationTypeCode"
+				></app-step-business-licence-confirmation>
 
 				<app-wizard-footer
 					(previousStepperStep)="onGoToPreviousStep()"
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/steps-business-licence-swl-sp-information.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/steps-business-licence-swl-sp-information.component.ts
index a50d6ba6c..4ab0194aa 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/steps-business-licence-swl-sp-information.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/business-licence-application/components/steps-business-licence-swl-sp-information.component.ts
@@ -31,7 +31,9 @@ import { StepBusinessLicenceLiabilityComponent } from './step-business-licence-l
 			</mat-step>
 
 			<mat-step *ngIf="isRenewalOrUpdate">
-				<app-step-business-licence-confirmation></app-step-business-licence-confirmation>
+				<app-step-business-licence-confirmation
+					[applicationTypeCode]="applicationTypeCode"
+				></app-step-business-licence-confirmation>
 
 				<app-wizard-footer
 					[isSoleProprietorReturnToSwl]="isSoleProprietorReturnToSwl"
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-submission-received.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-submission-received.component.ts
index 3080d2e4d..a1562c497 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-submission-received.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-submission-received.component.ts
@@ -4,7 +4,7 @@ import { Router } from '@angular/router';
 import { BooleanTypeCode } from '@app/core/code-types/model-desc.models';
 import { SPD_CONSTANTS } from '@app/core/constants/constants';
 import { ControllingMemberCrcService } from '@app/core/services/controlling-member-crc.service';
-import { ControllingMemberCrcRoutes } from '@app/modules/controlling-member-crc/controlling-member-crc-routing.module';
+import { ControllingMemberCrcRoutes } from '@app/modules/controlling-member-crc/controlling-member-crc-routes';
 
 @Component({
 	selector: 'app-controlling-member-submission-received',
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-wizard-new.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-wizard-new.component.ts
index 988ca878b..641bd3701 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-wizard-new.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-wizard-new.component.ts
@@ -14,7 +14,7 @@ import { StepsControllingMemberBackgroundComponent } from '@app/modules/controll
 import { StepsControllingMemberCitizenshipResidencyComponent } from '@app/modules/controlling-member-crc/components/steps-controlling-member-citizenship-residency.component';
 import { StepsControllingMemberPersonalInformationComponent } from '@app/modules/controlling-member-crc/components/steps-controlling-member-personal-information.component';
 import { StepsControllingMemberReviewComponent } from '@app/modules/controlling-member-crc/components/steps-controlling-member-review.component';
-import { ControllingMemberCrcRoutes } from '@app/modules/controlling-member-crc/controlling-member-crc-routing.module';
+import { ControllingMemberCrcRoutes } from '@app/modules/controlling-member-crc/controlling-member-crc-routes';
 import { DialogComponent, DialogOptions } from '@app/shared/components/dialog.component';
 import { HotToastService } from '@ngxpert/hot-toast';
 import { Subscription, distinctUntilChanged } from 'rxjs';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-wizard-update.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-wizard-update.component.ts
index 4f2286fe0..ff38fa3cf 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-wizard-update.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/controlling-member-wizard-update.component.ts
@@ -14,7 +14,7 @@ import { StepsControllingMemberBackgroundComponent } from '@app/modules/controll
 import { StepsControllingMemberCitizenshipResidencyComponent } from '@app/modules/controlling-member-crc/components/steps-controlling-member-citizenship-residency.component';
 import { StepsControllingMemberPersonalInformationComponent } from '@app/modules/controlling-member-crc/components/steps-controlling-member-personal-information.component';
 import { StepsControllingMemberReviewComponent } from '@app/modules/controlling-member-crc/components/steps-controlling-member-review.component';
-import { ControllingMemberCrcRoutes } from '@app/modules/controlling-member-crc/controlling-member-crc-routing.module';
+import { ControllingMemberCrcRoutes } from '@app/modules/controlling-member-crc/controlling-member-crc-routes';
 import { DialogComponent, DialogOptions } from '@app/shared/components/dialog.component';
 import { HotToastService } from '@ngxpert/hot-toast';
 import { Subscription, distinctUntilChanged } from 'rxjs';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/step-controlling-member-residential-address.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/step-controlling-member-residential-address.component.ts
index 84712c492..4dec1eb2e 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/step-controlling-member-residential-address.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/components/step-controlling-member-residential-address.component.ts
@@ -19,7 +19,11 @@ import { LicenceChildStepperStepComponent } from '@app/core/services/util.servic
 				</div>
 			</div>
 
-			<app-address [form]="form" [isReadonly]="isLoggedIn"></app-address>
+			<div class="row">
+				<div class="col-md-8 col-sm-12 mx-auto">
+					<app-address [form]="form" [isReadonly]="isLoggedIn" [isWideView]="true"></app-address>
+				</div>
+			</div>
 		</app-step-section>
 	`,
 	styles: [],
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-crc-routes.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-crc-routes.ts
new file mode 100644
index 000000000..25e103ee4
--- /dev/null
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-crc-routes.ts
@@ -0,0 +1,14 @@
+export class ControllingMemberCrcRoutes {
+	public static readonly CONTROLLING_MEMBER_CRC = 'controlling-member-crc';
+	public static readonly CONTROLLING_MEMBER_INVITATION = 'invitation';
+	public static readonly CONTROLLING_MEMBER_LOGIN = 'login';
+	public static readonly CONTROLLING_MEMBER_NEW = 'new';
+	public static readonly CONTROLLING_MEMBER_UPDATE = 'update';
+	public static readonly CONTROLLING_MEMBER_SUBMISSION_RECEIVED = 'submission';
+
+	public static readonly MODULE_PATH = ControllingMemberCrcRoutes.CONTROLLING_MEMBER_CRC;
+
+	public static path(route: string | null = null): string {
+		return route ? `/${ControllingMemberCrcRoutes.MODULE_PATH}/${route}` : `/${ControllingMemberCrcRoutes.MODULE_PATH}`;
+	}
+}
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-crc-routing.module.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-crc-routing.module.ts
index aae5008b3..515871d00 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-crc-routing.module.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-crc-routing.module.ts
@@ -3,24 +3,10 @@ import { RouterModule, Routes } from '@angular/router';
 import { ControllingMemberSubmissionReceivedComponent } from './components/controlling-member-submission-received.component';
 import { ControllingMemberWizardNewComponent } from './components/controlling-member-wizard-new.component';
 import { ControllingMemberWizardUpdateComponent } from './components/controlling-member-wizard-update.component';
+import { ControllingMemberCrcRoutes } from './controlling-member-crc-routes';
 import { ControllingMemberInvitationComponent } from './controlling-member-invitation.component';
 import { ControllingMemberLoginComponent } from './controlling-member-login.component';
 
-export class ControllingMemberCrcRoutes {
-	public static readonly CONTROLLING_MEMBER_CRC = 'controlling-member-crc';
-	public static readonly CONTROLLING_MEMBER_INVITATION = 'invitation';
-	public static readonly CONTROLLING_MEMBER_LOGIN = 'login';
-	public static readonly CONTROLLING_MEMBER_NEW = 'new';
-	public static readonly CONTROLLING_MEMBER_UPDATE = 'update';
-	public static readonly CONTROLLING_MEMBER_SUBMISSION_RECEIVED = 'submission';
-
-	public static readonly MODULE_PATH = ControllingMemberCrcRoutes.CONTROLLING_MEMBER_CRC;
-
-	public static path(route: string | null = null): string {
-		return route ? `/${ControllingMemberCrcRoutes.MODULE_PATH}/${route}` : `/${ControllingMemberCrcRoutes.MODULE_PATH}`;
-	}
-}
-
 const routes: Routes = [
 	{
 		path: `${ControllingMemberCrcRoutes.CONTROLLING_MEMBER_INVITATION}/:id`,
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-invitation.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-invitation.component.ts
index 2f9365090..b18e0819e 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-invitation.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-invitation.component.ts
@@ -4,7 +4,7 @@ import { BizMembersService } from '@app/api/services';
 import { StrictHttpResponse } from '@app/api/strict-http-response';
 import { SPD_CONSTANTS } from '@app/core/constants/constants';
 import { UtilService } from '@app/core/services/util.service';
-import { ControllingMemberCrcRoutes } from './controlling-member-crc-routing.module';
+import { ControllingMemberCrcRoutes } from './controlling-member-crc-routes';
 
 @Component({
 	selector: 'app-controlling-member-invitation',
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-login.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-login.component.ts
index 443c706e5..96149cc86 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-login.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/controlling-member-crc/controlling-member-login.component.ts
@@ -13,7 +13,7 @@ import { AuthProcessService } from '@app/core/services/auth-process.service';
 import { ControllingMemberCrcService } from '@app/core/services/controlling-member-crc.service';
 import { UtilService } from '@app/core/services/util.service';
 import { take, takeWhile, tap } from 'rxjs';
-import { ControllingMemberCrcRoutes } from './controlling-member-crc-routing.module';
+import { ControllingMemberCrcRoutes } from './controlling-member-crc-routes';
 
 @Component({
 	selector: 'app-controlling-member-login',
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-anonymous-update.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-anonymous-update.component.ts
index 49006892a..626f68884 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-anonymous-update.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-anonymous-update.component.ts
@@ -7,7 +7,7 @@ import { ApplicationTypeCode, PermitAppCommandResponse, WorkerLicenceTypeCode }
 import { StrictHttpResponse } from '@app/api/strict-http-response';
 import { BaseWizardComponent } from '@app/core/components/base-wizard.component';
 import { ApplicationService } from '@app/core/services/application.service';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { PermitApplicationService } from '@core/services/permit-application.service';
 import { HotToastService } from '@ngxpert/hot-toast';
 import { Subscription, distinctUntilChanged } from 'rxjs';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-access-code.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-access-code.component.ts
index 59d676c38..61d8a0835 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-access-code.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-access-code.component.ts
@@ -3,10 +3,10 @@ import { FormGroup } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ApplicationTypeCode, LicenceResponse, WorkerLicenceTypeCode } from '@app/api/models';
 import { SPD_CONSTANTS } from '@app/core/constants/constants';
+import { ApplicationService } from '@app/core/services/application.service';
 import { LicenceChildStepperStepComponent } from '@app/core/services/util.service';
 import { CommonAccessCodeAnonymousComponent } from '@app/modules/personal-licence-application/components/shared/common-step-components/common-access-code-anonymous.component';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
-import { ApplicationService } from '@app/core/services/application.service';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { PermitApplicationService } from '@core/services/permit-application.service';
 
 @Component({
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-employer-information.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-employer-information.component.ts
index 2543264f0..5da241cd5 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-employer-information.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-employer-information.component.ts
@@ -72,6 +72,7 @@ import { PermitApplicationService } from '@core/services/permit-application.serv
 						<app-address-form-autocomplete
 							(autocompleteAddress)="onAddressAutocomplete($event)"
 							(enterAddressManually)="onEnterAddressManually()"
+							[isWideView]="true"
 						>
 						</app-address-form-autocomplete>
 						<mat-error
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-expired.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-expired.component.ts
index b7814c48c..cf1292a98 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-expired.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-expired.component.ts
@@ -7,10 +7,15 @@ import { PermitApplicationService } from '@core/services/permit-application.serv
 @Component({
 	selector: 'app-step-permit-expired',
 	template: `
-		<app-step-section
-			title="Do you have an expired permit in BC?"
-			subtitle="Processing time will be reduced if you provide info from your past permit"
-		>
+		<app-step-section title="Do you have an expired permit in BC?">
+			<div class="row">
+				<div class="offset-md-2 col-md-8 col-sm-12">
+					<app-alert type="info" icon="info">
+						Processing time will be reduced if you provide info from your past permit
+					</app-alert>
+				</div>
+			</div>
+
 			<app-expired-licence
 				[form]="form"
 				[isLoggedIn]="isLoggedIn"
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-mailing-address.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-mailing-address.component.ts
index f0618ba4a..ed1c02104 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-mailing-address.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-mailing-address.component.ts
@@ -8,10 +8,15 @@ import { PermitApplicationService } from '@core/services/permit-application.serv
 	selector: 'app-step-permit-mailing-address',
 	template: `
 		<app-step-section [title]="title" [subtitle]="subtitle">
-			<app-address-and-is-same-flag
-				[form]="form"
-				isAddressTheSameLabel="My residential address and mailing address are the same"
-			></app-address-and-is-same-flag>
+			<div class="row">
+				<div class="col-md-8 col-sm-12 mx-auto">
+					<app-address-and-is-same-flag
+						[form]="form"
+						isAddressTheSameLabel="My residential address and mailing address are the same"
+						[isWideView]="true"
+					></app-address-and-is-same-flag>
+				</div>
+			</div>
 		</app-step-section>
 	`,
 	styles: [],
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-residential-address.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-residential-address.component.ts
index 22156aab1..cf700505d 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-residential-address.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-residential-address.component.ts
@@ -8,7 +8,11 @@ import { PermitApplicationService } from '@core/services/permit-application.serv
 	selector: 'app-step-permit-residential-address',
 	template: `
 		<app-step-section [title]="title" [subtitle]="subtitle">
-			<app-address [form]="form"></app-address>
+			<div class="row">
+				<div class="col-md-8 col-sm-12 mx-auto">
+					<app-address [form]="form" [isWideView]="true"></app-address>
+				</div>
+			</div>
 		</app-step-section>
 	`,
 	styles: [],
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-type-anonymous.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-type-anonymous.component.ts
index 550232f7c..484be7d1d 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-type-anonymous.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-type-anonymous.component.ts
@@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ApplicationTypeCode, BizTypeCode, LicenceFeeResponse, WorkerLicenceTypeCode } from '@app/api/models';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
 import { ApplicationService } from '@app/core/services/application.service';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { PermitApplicationService } from '@core/services/permit-application.service';
 
 @Component({
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-application-base-anonymous.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-application-base-anonymous.component.ts
index f4a341f2f..ae7e2c43d 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-application-base-anonymous.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-application-base-anonymous.component.ts
@@ -3,8 +3,8 @@ import { Router } from '@angular/router';
 import { AppRoutes } from '@app/app-routing.module';
 import { AuthProcessService } from '@app/core/services/auth-process.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { take, tap } from 'rxjs';
-import { PersonalLicenceApplicationRoutes } from '../../personal-licence-application-routing.module';
 
 @Component({
 	selector: 'app-worker-licence-application-base-anonymous',
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-anonymous-update.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-anonymous-update.component.ts
index 0b1d1304e..e4e9b1654 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-anonymous-update.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-anonymous-update.component.ts
@@ -11,7 +11,7 @@ import { ApplicationService } from '@app/core/services/application.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
 import { StepsWorkerLicenceBackgroundRenewAndUpdateComponent } from '@app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/steps-worker-licence-background-renew-and-update.component';
 import { StepsWorkerLicenceSelectionComponent } from '@app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/steps-worker-licence-selection.component';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { HotToastService } from '@ngxpert/hot-toast';
 import { Subscription, distinctUntilChanged } from 'rxjs';
 import { StepsWorkerLicenceIdentificationAnonymousComponent } from './worker-licence-wizard-step-components/steps-worker-licence-identification-anonymous.component';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-access-code.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-access-code.component.ts
index 9b1a400d3..f5e90e2d0 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-access-code.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-access-code.component.ts
@@ -7,7 +7,7 @@ import { ApplicationService } from '@app/core/services/application.service';
 import { LicenceChildStepperStepComponent } from '@app/core/services/util.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
 import { CommonAccessCodeAnonymousComponent } from '@app/modules/personal-licence-application/components/shared/common-step-components/common-access-code-anonymous.component';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 
 @Component({
 	selector: 'app-step-worker-licence-access-code',
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-application-type-anonymous.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-application-type-anonymous.component.ts
index f5a9ef78f..6ed5d6cc0 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-application-type-anonymous.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-application-type-anonymous.component.ts
@@ -4,7 +4,7 @@ import { Router } from '@angular/router';
 import { ApplicationTypeCode, WorkerLicenceTypeCode } from '@app/api/models';
 import { ApplicationService } from '@app/core/services/application.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 
 @Component({
 	selector: 'app-step-worker-licence-application-type-anonymous',
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-confirmation.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-confirmation.component.ts
index 7b445e6c9..fd2a85f6a 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-confirmation.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-confirmation.component.ts
@@ -20,40 +20,40 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 			<div class="row">
 				<div class="col-xl-7 col-lg-12 col-md-12 col-sm-12 mx-auto">
 					<div class="row mt-0 mb-3">
-						<div class="col-lg-6 col-md-12">
+						<div class="col-lg-4 col-md-12">
 							<div class="text-label d-block text-muted">Licence Holder Name</div>
 							<div class="summary-text-data">{{ cardHolderName }}</div>
 						</div>
-						<div class="col-lg-6 col-md-12">
+						<div class="col-lg-4 col-md-12">
 							<div class="text-label d-block text-muted">Licence Number</div>
 							<div class="summary-text-data">{{ originalLicenceNumber }}</div>
 						</div>
-						<div class="col-lg-6 col-md-12">
-							<div class="text-label d-block text-muted">Licence Categories</div>
-							<div class="summary-text-data">
-								<ul class="m-0">
-									<ng-container *ngFor="let category of categoryList; let i = index">
-										<li>{{ category | options : 'WorkerCategoryTypes' }}</li>
-									</ng-container>
-								</ul>
-							</div>
+						<div class="col-lg-4 col-md-12">
+							<div class="text-label d-block text-muted">Licence Term</div>
+							<div class="summary-text-data">{{ originalLicenceTermCode | options : 'LicenceTermTypes' }}</div>
 						</div>
-						<div class="col-lg-6 col-md-12">
+						<div class="col-lg-4 col-md-12">
 							<div class="text-label d-block text-muted">Expiry Date</div>
 							<div class="summary-text-data">
 								{{ originalExpiryDate | formatDate : formalDateFormat }}
 							</div>
 						</div>
-						<div class="col-lg-6 col-md-12">
-							<div class="text-label d-block text-muted">Licence Term</div>
-							<div class="summary-text-data">{{ originalLicenceTermCode | options : 'LicenceTermTypes' }}</div>
-						</div>
-						<div class="col-lg-6 col-md-12" *ngIf="feeAmount">
+						<div class="col-lg-4 col-md-12" *ngIf="feeAmount">
 							<div class="text-label d-block text-muted">{{ applicationTypeCode }} Fee</div>
 							<div class="summary-text-data">
 								{{ feeAmount | currency : 'CAD' : 'symbol-narrow' : '1.0' | default }}
 							</div>
 						</div>
+						<div class="col-md-12" [ngClass]="feeAmount ? 'col-lg-4' : 'col-lg-8'">
+							<div class="text-label d-block text-muted">Licence Categories</div>
+							<div class="summary-text-data">
+								<ul class="m-0">
+									<ng-container *ngFor="let category of categoryList; let i = index">
+										<li>{{ category | options : 'WorkerCategoryTypes' }}</li>
+									</ng-container>
+								</ul>
+							</div>
+						</div>
 					</div>
 				</div>
 			</div>
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-summary-review-anonymous.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-summary-review-anonymous.component.ts
index acc8f36fd..f0f52a1bd 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-summary-review-anonymous.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/anonymous/worker-licence-wizard-step-components/step-worker-licence-summary-review-anonymous.component.ts
@@ -54,27 +54,12 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 													{{ applicationTypeCode | options : 'ApplicationTypes' }}
 												</div>
 											</div>
-											<ng-container *ngIf="applicationTypeCode !== applicationTypeCodes.Update">
-												<div class="col-lg-4 col-md-12" *ngIf="soleProprietorBizTypeCode">
-													<div class="text-label d-block text-muted">Sole Proprietorship Security Business Licence</div>
-													<div class="summary-text-data">
-														{{ soleProprietorBizTypeCode | options : 'BizTypes' }}
-													</div>
-												</div>
-											</ng-container>
-
-											<ng-container
-												*ngFor="let category of categoryList; let i = index; let first = first; let last = last"
-											>
-												<div class="col-lg-4 col-md-12">
-													<div class="text-label d-block text-muted">
-														Licence Category <span *ngIf="categoryList.length > 1"> #{{ i + 1 }}</span>
-													</div>
-													<div class="summary-text-data">
-														{{ category | options : 'WorkerCategoryTypes' }}
-													</div>
+											<div class="col-lg-4 col-md-12" *ngIf="soleProprietorBizTypeCode">
+												<div class="text-label d-block text-muted">Sole Proprietorship Security Business Licence</div>
+												<div class="summary-text-data">
+													{{ soleProprietorBizTypeCode | options : 'BizTypes' }}
 												</div>
-											</ng-container>
+											</div>
 											<div class="col-lg-4 col-md-12">
 												<div class="text-label d-block text-muted">Licence Term</div>
 												<div class="summary-text-data">{{ licenceTermCode | options : 'LicenceTermTypes' }}</div>
@@ -85,6 +70,16 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 													{{ licenceFee | currency : 'CAD' : 'symbol-narrow' : '1.0' | default }}
 												</div>
 											</div>
+											<div class="col-xl-4 col-lg-6 col-md-12">
+												<div class="text-label d-block text-muted">Licence Categories</div>
+												<div class="summary-text-data">
+													<ul class="m-0">
+														<ng-container *ngFor="let category of categoryList; let i = index">
+															<li>{{ category | options : 'WorkerCategoryTypes' }}</li>
+														</ng-container>
+													</ul>
+												</div>
+											</div>
 										</div>
 
 										<ng-container *ngIf="isAnyDocuments">
@@ -1028,7 +1023,7 @@ export class StepWorkerLicenceSummaryReviewAnonymousComponent implements OnInit
 	}
 
 	get photoOfYourselfAttachments(): File[] {
-		return this.workerApplicationService.getSummaryphotoOfYourselfAttachments(this.licenceModelData);
+		return this.workerApplicationService.getSummaryphotoOfYourselfAttachments(this.licenceModelData) ?? [];
 	}
 
 	get emailAddress(): string {
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-access-code-authorized.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-access-code-authorized.component.ts
index a0fefd7a4..f4ea8241f 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-access-code-authorized.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-access-code-authorized.component.ts
@@ -6,7 +6,7 @@ import { StrictHttpResponse } from '@app/api/strict-http-response';
 import { SPD_CONSTANTS } from '@app/core/constants/constants';
 import { LicenceChildStepperStepComponent } from '@app/core/services/util.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { FormErrorStateMatcher } from '@app/shared/directives/form-error-state-matcher.directive';
 import { HotToastService } from '@ngxpert/hot-toast';
 
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-application-base-authenticated.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-application-base-authenticated.component.ts
index 3a9017262..b02cf34f4 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-application-base-authenticated.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-application-base-authenticated.component.ts
@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
 import { AuthProcessService } from '@app/core/services/auth-process.service';
 import { AuthUserBcscService } from '@app/core/services/auth-user-bcsc.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { PermitApplicationService } from '@core/services/permit-application.service';
 
 @Component({
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-first-time-user-selection.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-first-time-user-selection.component.ts
index 2e03a726b..4d0cd4ced 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-first-time-user-selection.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-first-time-user-selection.component.ts
@@ -5,7 +5,7 @@ import { ApplicantProfileService } from '@app/api/services';
 import { SPD_CONSTANTS } from '@app/core/constants/constants';
 import { LicenceChildStepperStepComponent, UtilService } from '@app/core/services/util.service';
 import { CommonSwlPermitTermsComponent } from '@app/modules/personal-licence-application/components/shared/common-step-components/common-swl-permit-terms.component';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 
 @Component({
 	selector: 'app-licence-first-time-user-selection',
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-first-time-user-terms-of-use.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-first-time-user-terms-of-use.component.ts
index 340bb0647..8134c13b7 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-first-time-user-terms-of-use.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-first-time-user-terms-of-use.component.ts
@@ -6,7 +6,7 @@ import { AuthUserBcscService } from '@app/core/services/auth-user-bcsc.service';
 import { LicenceChildStepperStepComponent } from '@app/core/services/util.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
 import { CommonSwlPermitTermsComponent } from '@app/modules/personal-licence-application/components/shared/common-step-components/common-swl-permit-terms.component';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 
 @Component({
 	selector: 'app-licence-first-time-user-terms-of-use',
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-user-applications.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-user-applications.component.ts
index 8d0528806..1968657ee 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-user-applications.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/licence-user-applications.component.ts
@@ -12,7 +12,7 @@ import {
 } from '@app/core/services/application.service';
 import { ConfigService } from '@app/core/services/config.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 
 import { PermitApplicationService } from '@core/services/permit-application.service';
 import { Observable, forkJoin, take, tap } from 'rxjs';
@@ -158,22 +158,7 @@ import { Observable, forkJoin, take, tap } from 'rxjs';
 			</div>
 		</section>
 	`,
-	styles: [
-		`
-			.appl-chip-option {
-				height: 35px;
-			}
-
-			.appl-chip-option-item {
-				vertical-align: text-bottom;
-			}
-
-			.error-color {
-				font-weight: 600;
-				color: var(--color-red-dark);
-			}
-		`,
-	],
+	styles: [],
 })
 export class LicenceUserApplicationsComponent implements OnInit {
 	constants = SPD_CONSTANTS;
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-authenticated-new.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-authenticated-new.component.ts
index 521c92912..cdc64b59d 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-authenticated-new.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-authenticated-new.component.ts
@@ -9,7 +9,7 @@ import { StrictHttpResponse } from '@app/api/strict-http-response';
 import { BaseWizardComponent } from '@app/core/components/base-wizard.component';
 import { ApplicationService } from '@app/core/services/application.service';
 import { StepsPermitDetailsNewComponent } from '@app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/steps-permit-details-new.component';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { PermitApplicationService } from '@core/services/permit-application.service';
 import { HotToastService } from '@ngxpert/hot-toast';
 import { Subscription, distinctUntilChanged } from 'rxjs';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-authenticated-update.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-authenticated-update.component.ts
index 090da6b35..82ec09261 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-authenticated-update.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-authenticated-update.component.ts
@@ -7,7 +7,7 @@ import { ApplicationTypeCode, PermitAppCommandResponse, WorkerLicenceTypeCode }
 import { StrictHttpResponse } from '@app/api/strict-http-response';
 import { BaseWizardComponent } from '@app/core/components/base-wizard.component';
 import { ApplicationService } from '@app/core/services/application.service';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { PermitApplicationService } from '@core/services/permit-application.service';
 import { HotToastService } from '@ngxpert/hot-toast';
 import { Subscription, distinctUntilChanged } from 'rxjs';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-step-components/step-permit-update-terms-authenticated.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-step-components/step-permit-update-terms-authenticated.component.ts
index 8853ed9e0..000543543 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-step-components/step-permit-update-terms-authenticated.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-step-components/step-permit-update-terms-authenticated.component.ts
@@ -2,7 +2,7 @@ import { Component, ViewChild, ViewEncapsulation } from '@angular/core';
 import { Router } from '@angular/router';
 import { ApplicationTypeCode, WorkerLicenceTypeCode } from '@app/api/models';
 import { StepPermitTermsOfUseComponent } from '@app/modules/personal-licence-application/components/anonymous/permit-wizard-step-components/step-permit-terms-of-use.component';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { PermitApplicationService } from '@core/services/permit-application.service';
 
 @Component({
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-step-components/step-permit-user-profile.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-step-components/step-permit-user-profile.component.ts
index cef2aeb6a..f956e666a 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-step-components/step-permit-user-profile.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/permit-wizard-step-components/step-permit-user-profile.component.ts
@@ -5,7 +5,7 @@ import { ApplicationTypeCode, WorkerLicenceTypeCode } from '@app/api/models';
 import { LicenceChildStepperStepComponent, UtilService } from '@app/core/services/util.service';
 import { CommonUserProfileLicenceCriminalHistoryComponent } from '@app/modules/personal-licence-application/components/authenticated/user-profile-components/common-user-profile-licence-criminal-history.component';
 import { CommonUserProfileComponent } from '@app/modules/personal-licence-application/components/authenticated/user-profile-components/common-user-profile.component';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { PermitApplicationService } from '@core/services/permit-application.service';
 
 @Component({
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/user-profile-components/common-user-profile.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/user-profile-components/common-user-profile.component.ts
index 5f05ae25c..402ced94a 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/user-profile-components/common-user-profile.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/user-profile-components/common-user-profile.component.ts
@@ -62,11 +62,7 @@ import { FormPersonalInformationComponent } from '@app/shared/components/form-pe
 							</app-alert>
 
 							<section>
-								<app-address
-									[form]="residentialAddressFormGroup"
-									[isWizardStep]="false"
-									[isReadonly]="true"
-								></app-address>
+								<app-address [form]="residentialAddressFormGroup" [isReadonly]="true"></app-address>
 							</section>
 						</div>
 					</mat-expansion-panel>
@@ -88,7 +84,6 @@ import { FormPersonalInformationComponent } from '@app/shared/components/form-pe
 
 							<app-address-and-is-same-flag
 								[form]="mailingAddressFormGroup"
-								[isWizardStep]="false"
 								[isReadonly]="isReadonlyMailingAddress"
 								[isCheckboxReadOnly]="isReadonlyMailingAddress"
 								isAddressTheSameLabel="The residential address and mailing address are the same"
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/user-profile.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/user-profile.component.ts
index 7fbf8faee..38fd80987 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/user-profile.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/user-profile.component.ts
@@ -2,7 +2,7 @@ import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { UtilService } from '@app/core/services/util.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { HotToastService } from '@ngxpert/hot-toast';
 import { CommonUserProfileComponent } from './user-profile-components/common-user-profile.component';
 
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-authenticated-new.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-authenticated-new.component.ts
index 050e31187..e2a0bb59f 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-authenticated-new.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-authenticated-new.component.ts
@@ -12,7 +12,7 @@ import { ApplicationService } from '@app/core/services/application.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
 import { BusinessLicenceApplicationRoutes } from '@app/modules/business-licence-application/business-license-application-routes';
 import { StepsWorkerLicenceSelectionComponent } from '@app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/steps-worker-licence-selection.component';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { HotToastService } from '@ngxpert/hot-toast';
 import { Subscription, distinctUntilChanged } from 'rxjs';
 import { StepsWorkerLicenceIdentificationAuthenticatedComponent } from './worker-licence-wizard-step-components/steps-worker-licence-identification-authenticated.component';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-authenticated-update.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-authenticated-update.component.ts
index 0662acc0c..fc8b6f238 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-authenticated-update.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-authenticated-update.component.ts
@@ -8,7 +8,7 @@ import { StrictHttpResponse } from '@app/api/strict-http-response';
 import { BaseWizardComponent } from '@app/core/components/base-wizard.component';
 import { ApplicationService } from '@app/core/services/application.service';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { HotToastService } from '@ngxpert/hot-toast';
 import { Subscription, distinctUntilChanged } from 'rxjs';
 import { StepsWorkerLicenceReviewAuthenticatedComponent } from './worker-licence-wizard-step-components/steps-worker-licence-review-authenticated.component';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-summary-review-authenticated.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-summary-review-authenticated.component.ts
index 0630ca245..dbd6e42e4 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-summary-review-authenticated.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-summary-review-authenticated.component.ts
@@ -53,24 +53,12 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 													{{ applicationTypeCode | options : 'ApplicationTypes' }}
 												</div>
 											</div>
-											<div class="col-lg-4 col-md-12">
+											<div class="col-lg-4 col-md-12" *ngIf="soleProprietorBizTypeCode">
 												<div class="text-label d-block text-muted">Sole Proprietorship Security Business Licence</div>
-												<div class="summary-text-data">{{ isSoleProprietor }}</div>
-											</div>
-										</div>
-										<div class="row mt-0">
-											<ng-container
-												*ngFor="let category of categoryList; let i = index; let first = first; let last = last"
-											>
-												<div class="col-lg-4 col-md-12">
-													<div class="text-label d-block text-muted">
-														Licence Category <span *ngIf="categoryList.length > 1"> #{{ i + 1 }}</span>
-													</div>
-													<div class="summary-text-data">
-														{{ category | options : 'WorkerCategoryTypes' }}
-													</div>
+												<div class="summary-text-data">
+													{{ soleProprietorBizTypeCode | options : 'BizTypes' }}
 												</div>
-											</ng-container>
+											</div>
 											<div class="col-lg-4 col-md-12">
 												<div class="text-label d-block text-muted">Licence Term</div>
 												<div class="summary-text-data">{{ licenceTermCode | options : 'LicenceTermTypes' }}</div>
@@ -81,6 +69,16 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 													{{ licenceFee | currency : 'CAD' : 'symbol-narrow' : '1.0' | default }}
 												</div>
 											</div>
+											<div class="col-xl-4 col-lg-6 col-md-12">
+												<div class="text-label d-block text-muted">Licence Categories</div>
+												<div class="summary-text-data">
+													<ul class="m-0">
+														<ng-container *ngFor="let category of categoryList; let i = index">
+															<li>{{ category | options : 'WorkerCategoryTypes' }}</li>
+														</ng-container>
+													</ul>
+												</div>
+											</div>
 										</div>
 
 										<ng-container *ngIf="isAnyDocuments">
@@ -256,10 +254,14 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 													</div>
 												</div>
 												<ng-container *ngIf="carryAndUseRestraints === booleanTypeCodes.Yes">
-													<div class="col-lg-8 col-md-12">
-														<div class="text-label d-block text-muted">
+													<div class="col-xl-4 col-lg-6 col-md-12">
+														<div class="text-label d-block text-muted">Proof of Qualification</div>
+														<div class="summary-text-data">
 															{{ carryAndUseRestraintsDocument | options : 'RestraintDocumentTypes' }}
 														</div>
+													</div>
+													<div class="col-xl-4 col-lg-6 col-md-12">
+														<div class="text-label d-block text-muted">Proof of Qualification Documents</div>
 														<div class="summary-text-data">
 															<ul class="m-0">
 																<ng-container *ngFor="let doc of carryAndUseRestraintsAttachments; let i = index">
@@ -716,7 +718,7 @@ export class StepWorkerLicenceSummaryReviewAuthenticatedComponent implements OnI
 		return this.workerApplicationService.getSummaryweightUnitCode(this.licenceModelData);
 	}
 
-	get photoOfYourselfAttachments(): File[] {
+	get photoOfYourselfAttachments(): File[] | null {
 		return this.workerApplicationService.getSummaryphotoOfYourselfAttachments(this.licenceModelData);
 	}
 
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-summary-review-update-authenticated.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-summary-review-update-authenticated.component.ts
index 3bec82fab..98d8d8daa 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-summary-review-update-authenticated.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-summary-review-update-authenticated.component.ts
@@ -45,6 +45,19 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 								{{ originalExpiryDate | formatDate : formalDateFormat }}
 							</div>
 						</div>
+
+						<div class="col-xl-4 col-lg-6 col-md-12">
+							<div class="text-label d-block text-muted">Licence Term</div>
+							<div class="summary-text-data">{{ originalLicenceTermCode | options : 'LicenceTermTypes' }}</div>
+						</div>
+						<div class="col-xl-4 col-lg-6 col-md-12">
+							<ng-container *ngIf="isUpdate">
+								<div class="text-label d-block text-muted">Reprint Fee</div>
+								<div class="summary-text-data">
+									{{ licenceFee | currency : 'CAD' : 'symbol-narrow' : '1.0' | default }}
+								</div>
+							</ng-container>
+						</div>
 						<div class="col-xl-4 col-lg-6 col-md-12">
 							<div class="text-label d-block text-muted">Licence Categories</div>
 							<div class="summary-text-data">
@@ -60,14 +73,18 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 							<div class="col-xl-4 col-lg-6 col-md-12">
 								<div class="text-label d-block text-muted">Request to Use Restraints?</div>
 								<div class="summary-text-data">
-									{{ carryAndUseRestraints | options : 'BooleanTypes' }}
+									{{ carryAndUseRestraints }}
 								</div>
 							</div>
 							<ng-container *ngIf="carryAndUseRestraints === booleanTypeCodeYes">
 								<div class="col-xl-4 col-lg-6 col-md-12">
-									<div class="text-label d-block text-muted">
+									<div class="text-label d-block text-muted">Proof of Qualification</div>
+									<div class="summary-text-data">
 										{{ carryAndUseRestraintsDocument | options : 'RestraintDocumentTypes' }}
 									</div>
+								</div>
+								<div class="col-xl-4 col-lg-6 col-md-12">
+									<div class="text-label d-block text-muted">Proof of Qualification Documents</div>
 									<div class="summary-text-data">
 										<ul class="m-0">
 											<ng-container *ngFor="let doc of carryAndUseRestraintsAttachments; let i = index">
@@ -103,23 +120,6 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 								</div>
 							</ng-container>
 						</ng-container>
-
-						<div class="col-xl-4 col-lg-6 col-md-12">
-							<div class="text-label d-block text-muted">Licence Term</div>
-							<div class="summary-text-data">{{ originalLicenceTermCode | options : 'LicenceTermTypes' }}</div>
-						</div>
-						<ng-container *ngIf="isUpdate">
-							<div class="col-xl-4 col-lg-6 col-md-12">
-								<div class="text-label d-block text-muted">Reprint Licence</div>
-								<div class="summary-text-data">Yes</div>
-							</div>
-							<div class="col-xl-4 col-lg-6 col-md-12">
-								<div class="text-label d-block text-muted">Reprint Fee</div>
-								<div class="summary-text-data">
-									{{ licenceFee | currency : 'CAD' : 'symbol-narrow' : '1.0' | default }}
-								</div>
-							</div>
-						</ng-container>
 					</div>
 				</div>
 			</div>
@@ -271,7 +271,7 @@ export class StepWorkerLicenceSummaryReviewUpdateAuthenticatedComponent implemen
 	}
 
 	get photoOfYourselfAttachments(): File[] {
-		return this.workerApplicationService.getSummaryphotoOfYourselfAttachments(this.licenceModelData);
+		return this.workerApplicationService.getSummaryphotoOfYourselfAttachments(this.licenceModelData) ?? [];
 	}
 
 	get categoryList(): Array<WorkerCategoryTypeCode> {
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-update-terms-authenticated.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-update-terms-authenticated.component.ts
index 0d3cc560d..f455185ae 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-update-terms-authenticated.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/authenticated/worker-licence-wizard-step-components/step-worker-licence-update-terms-authenticated.component.ts
@@ -2,7 +2,7 @@ import { Component, ViewChild, ViewEncapsulation } from '@angular/core';
 import { Router } from '@angular/router';
 import { ApplicationTypeCode } from '@app/api/models';
 import { StepWorkerLicenceTermsOfUseComponent } from '@app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-terms-of-use.component';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 
 @Component({
 	selector: 'app-step-worker-licence-update-terms-authenticated',
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/common-step-components/common-access-code-anonymous.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/common-step-components/common-access-code-anonymous.component.ts
index e3b39d90d..1f181c057 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/common-step-components/common-access-code-anonymous.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/common-step-components/common-access-code-anonymous.component.ts
@@ -10,7 +10,7 @@ import {
 } from '@app/api/models';
 import { SPD_CONSTANTS } from '@app/core/constants/constants';
 import { WorkerApplicationService } from '@app/core/services/worker-application.service';
-import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routing.module';
+import { PersonalLicenceApplicationRoutes } from '@app/modules/personal-licence-application/personal-licence-application-routes';
 import { FormErrorStateMatcher } from '@app/shared/directives/form-error-state-matcher.directive';
 import { OptionsPipe } from '@app/shared/pipes/options.pipe';
 import { PermitApplicationService } from '@core/services/permit-application.service';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/licence-active-swl-permit-licences.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/licence-active-swl-permit-licences.component.ts
index 6a497439c..63c602f2f 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/licence-active-swl-permit-licences.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/licence-active-swl-permit-licences.component.ts
@@ -24,12 +24,18 @@ import { MainLicenceResponse } from '@app/core/services/application.service';
 						<div class="row">
 							<div class="col-lg-3">
 								<div class="d-block text-muted mt-2 mt-lg-0">Licence Number</div>
-								<div class="text-data">{{ licence.licenceNumber }}</div>
+								<div class="text-data fw-bold">{{ licence.licenceNumber }}</div>
 							</div>
-							<div class="col-lg-6">
+							<div class="col-lg-3">
 								<div class="d-block text-muted mt-2 mt-lg-0">Licence Term</div>
 								<div class="text-data">{{ licence.licenceTermCode | options : 'LicenceTermTypes' }}</div>
 							</div>
+							<div class="col-lg-3">
+								<div class="d-block text-muted mt-2 mt-lg-0">Expiry Date</div>
+								<div class="text-data" [ngClass]="licence.isRenewalPeriod ? 'error-color' : ''">
+									{{ licence.licenceExpiryDate | formatDate : constants.date.formalDateFormat }}
+								</div>
+							</div>
 							<div class="col-lg-3 text-end">
 								<mat-chip-option [selectable]="false" class="appl-chip-option mat-chip-green">
 									<mat-icon class="appl-chip-option-item">check_circle</mat-icon>
@@ -46,13 +52,7 @@ import { MainLicenceResponse } from '@app/core/services/application.service';
 							"
 						>
 							<div class="row mb-2">
-								<div class="col-lg-3">
-									<div class="d-block text-muted mt-2 mt-lg-0">Expiry Date</div>
-									<div class="text-data" [ngClass]="licence.isRenewalPeriod ? 'error-color' : ''">
-										{{ licence.licenceExpiryDate | formatDate : constants.date.formalDateFormat }}
-									</div>
-								</div>
-								<div class="col-lg-9">
+								<div class="col-lg-6">
 									<div class="d-block text-muted mt-2 mt-lg-0">Licence Categories</div>
 									<div class="text-data">
 										<ul class="m-0">
@@ -66,16 +66,16 @@ import { MainLicenceResponse } from '@app/core/services/application.service';
 									<div class="col-lg-3">
 										<div class="d-block text-muted mt-2">Dog Authorization</div>
 										<div class="text-data">
-											<ng-container *ngIf="licence.dogAuthorization; noDogAuthorization">
+											<ng-container *ngIf="licence.dogAuthorization; else noDogAuthorization">
 												Authorized to use dogs
 											</ng-container>
 											<ng-template #noDogAuthorization> Not authorized to use dogs </ng-template>
 										</div>
 									</div>
-									<div class="col-lg-9">
+									<div class="col-lg-3">
 										<div class="d-block text-muted mt-2">Restraint Authorization</div>
 										<div class="text-data">
-											<ng-container *ngIf="licence.restraintAuthorization; noRestraintAuthorization">
+											<ng-container *ngIf="licence.restraintAuthorization; else noRestraintAuthorization">
 												Authorized to use restraints
 											</ng-container>
 											<ng-template #noRestraintAuthorization> Not authorized to use restraints </ng-template>
@@ -125,13 +125,7 @@ import { MainLicenceResponse } from '@app/core/services/application.service';
 						</ng-container>
 						<ng-template #IsPermitContent>
 							<div class="row mb-2">
-								<div class="col-lg-9">
-									<div class="d-block text-muted mt-2 mt-lg-0">Expiry Date</div>
-									<div class="text-data" [ngClass]="licence.isRenewalPeriod ? 'error-color' : ''">
-										{{ licence.licenceExpiryDate | formatDate : constants.date.formalDateFormat }}
-									</div>
-								</div>
-								<div class="col-lg-3 text-end" *ngIf="!applicationIsInProgress">
+								<div class="offset-lg-9 col-lg-3 text-end" *ngIf="!applicationIsInProgress">
 									<button
 										mat-flat-button
 										color="primary"
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-expired.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-expired.component.ts
index abe935652..fbcf33fe3 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-expired.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-expired.component.ts
@@ -7,10 +7,15 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 @Component({
 	selector: 'app-step-worker-licence-expired',
 	template: `
-		<app-step-section
-			title="Do you have an expired licence in BC?"
-			subtitle="Processing time will be reduced if you provide info from your past licence"
-		>
+		<app-step-section title="Do you have an expired licence in BC?">
+			<div class="row">
+				<div class="offset-md-2 col-md-8 col-sm-12">
+					<app-alert type="info" icon="info">
+						Processing time will be reduced if you provide info from your past licence
+					</app-alert>
+				</div>
+			</div>
+
 			<app-expired-licence
 				[form]="form"
 				[isLoggedIn]="isLoggedIn"
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-mailing-address-anonymous.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-mailing-address-anonymous.component.ts
index b556e66e1..56123ad66 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-mailing-address-anonymous.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-mailing-address-anonymous.component.ts
@@ -8,10 +8,15 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 	selector: 'app-step-worker-licence-mailing-address-anonymous',
 	template: `
 		<app-step-section [title]="title" [subtitle]="subtitle">
-			<app-address-and-is-same-flag
-				[form]="form"
-				isAddressTheSameLabel="My residential address and mailing address are the same"
-			></app-address-and-is-same-flag>
+			<div class="row">
+				<div class="col-md-8 col-sm-12 mx-auto">
+					<app-address-and-is-same-flag
+						[form]="form"
+						isAddressTheSameLabel="My residential address and mailing address are the same"
+						[isWideView]="true"
+					></app-address-and-is-same-flag>
+				</div>
+			</div>
 		</app-step-section>
 	`,
 	styles: [],
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-mailing-address-replacement-anonymous.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-mailing-address-replacement-anonymous.component.ts
index 2c463a7c6..466f68927 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-mailing-address-replacement-anonymous.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-mailing-address-replacement-anonymous.component.ts
@@ -8,7 +8,11 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 	selector: 'app-step-worker-licence-mailing-address-replacement-anonymous',
 	template: `
 		<app-step-section [title]="title" [subtitle]="subtitle">
-			<app-address [form]="form"></app-address>
+			<div class="row">
+				<div class="col-md-8 col-sm-12 mx-auto">
+					<app-address [form]="form"></app-address>
+				</div>
+			</div>
 
 			<form [formGroup]="form" novalidate>
 				<div class="row">
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-residential-address.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-residential-address.component.ts
index cd2e622f1..3310ca1d6 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-residential-address.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/components/shared/worker-licence-wizard-step-components/step-worker-licence-residential-address.component.ts
@@ -8,7 +8,11 @@ import { WorkerApplicationService } from '@app/core/services/worker-application.
 	selector: 'app-step-worker-licence-residential-address',
 	template: `
 		<app-step-section [title]="title" [subtitle]="subtitle">
-			<app-address [form]="form"></app-address>
+			<div class="row">
+				<div class="col-md-8 col-sm-12 mx-auto">
+					<app-address [form]="form" [isWideView]="true"></app-address>
+				</div>
+			</div>
 		</app-step-section>
 	`,
 	styles: [],
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/personal-licence-application-routes.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/personal-licence-application-routes.ts
new file mode 100644
index 000000000..134bd20b4
--- /dev/null
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/personal-licence-application-routes.ts
@@ -0,0 +1,95 @@
+export class PersonalLicenceApplicationRoutes {
+	public static readonly LICENCE_APPLICATION = 'personal-licence';
+
+	// AUTHENTICATED
+	public static readonly LICENCE_BASE = 'application';
+	public static readonly LICENCE_USER_APPLICATIONS_AUTHENTICATED = 'user-applications';
+
+	public static readonly LICENCE_RETURN_FROM_BL_SOLE_PROPRIETOR = 'return-user-applications';
+	public static readonly LICENCE_RETURN_FROM_BL_SOLE_PROPRIETOR_ANONYMOUS = 'return-user-applications-anonymous';
+
+	public static readonly LICENCE_FIRST_TIME_USER_TERMS = 'terms-and-conditions';
+	public static readonly LICENCE_FIRST_TIME_USER_SELECTION = 'user-selection';
+	public static readonly LICENCE_LINK = 'licence-link';
+	public static readonly LICENCE_LOGIN_USER_PROFILE = 'user-profile';
+
+	public static readonly WORKER_LICENCE_UPDATE_TERMS_AUTHENTICATED = 'licence-update-terms';
+	public static readonly WORKER_LICENCE_USER_PROFILE_AUTHENTICATED = 'licence-user-profile';
+
+	public static readonly PERMIT_UPDATE_TERMS_AUTHENTICATED = 'permit-update-terms';
+	public static readonly PERMIT_USER_PROFILE_AUTHENTICATED = 'permit-user-profile';
+
+	public static readonly PERMIT_NEW_AUTHENTICATED = 'permit-new';
+	public static readonly PERMIT_RENEWAL_AUTHENTICATED = 'permit-renew';
+	public static readonly PERMIT_UPDATE_AUTHENTICATED = 'permit-update';
+
+	public static readonly WORKER_LICENCE_NEW_AUTHENTICATED = 'worker-licence-new';
+	public static readonly WORKER_LICENCE_RENEWAL_AUTHENTICATED = 'worker-licence-renew';
+	public static readonly WORKER_LICENCE_UPDATE_AUTHENTICATED = 'worker-licence-update';
+	public static readonly WORKER_LICENCE_REPLACEMENT_AUTHENTICATED = 'worker-licence-replacement';
+
+	// ANONYMOUS
+	public static readonly LICENCE_APPLICATION_ANONYMOUS = 'personal-application-anonymous';
+	public static readonly LICENCE_APPLICATION_TYPE_ANONYMOUS = 'licence-application-type';
+	public static readonly LICENCE_ACCESS_CODE_ANONYMOUS = 'licence-access-code';
+
+	public static readonly WORKER_LICENCE_NEW_ANONYMOUS = 'worker-licence-new';
+	public static readonly WORKER_LICENCE_RENEWAL_ANONYMOUS = 'worker-licence-renewal';
+	public static readonly WORKER_LICENCE_REPLACEMENT_ANONYMOUS = 'worker-licence-replacement';
+	public static readonly WORKER_LICENCE_UPDATE_ANONYMOUS = 'worker-licence-update';
+
+	public static readonly PERMIT_APPLICATION_ANONYMOUS = 'permit-application-anonymous';
+	public static readonly PERMIT_ACCESS_CODE_ANONYMOUS = 'permit-access-code';
+	public static readonly PERMIT_TYPE_ANONYMOUS = 'permit-type';
+	public static readonly PERMIT_NEW_ANONYMOUS = 'permit-new';
+	public static readonly PERMIT_RENEWAL_ANONYMOUS = 'permit-renewal';
+	public static readonly PERMIT_UPDATE_ANONYMOUS = 'permit-update';
+
+	// PAYMENT
+	public static readonly PAYMENT_SUCCESS = 'payment-success';
+	public static readonly PAYMENT_FAIL = 'payment-fail';
+	public static readonly PAYMENT_CANCEL = 'payment-cancel';
+	public static readonly PAYMENT_ERROR = 'payment-error';
+	public static readonly LICENCE_UPDATE_SUCCESS = 'licence-update-success';
+	public static readonly PERMIT_UPDATE_SUCCESS = 'permit-update-success';
+
+	public static readonly MODULE_PATH = PersonalLicenceApplicationRoutes.LICENCE_APPLICATION;
+
+	public static path(route: string | null = null): string {
+		return route
+			? `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${route}`
+			: `/${PersonalLicenceApplicationRoutes.MODULE_PATH}`;
+	}
+
+	public static pathUserApplications(): string {
+		return `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}/${PersonalLicenceApplicationRoutes.LICENCE_USER_APPLICATIONS_AUTHENTICATED}`;
+	}
+
+	public static pathReturnFromBusinessLicenceSoleProprietor(): string {
+		return `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}/${PersonalLicenceApplicationRoutes.LICENCE_RETURN_FROM_BL_SOLE_PROPRIETOR}`;
+	}
+
+	public static pathSecurityWorkerLicenceAuthenticated(route: string | null = null): string {
+		return route
+			? `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}/${route}`
+			: `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}`;
+	}
+
+	public static pathSecurityWorkerLicenceAnonymous(route: string | null = null): string {
+		return route
+			? `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_APPLICATION_ANONYMOUS}/${route}`
+			: `/${PersonalLicenceApplicationRoutes.MODULE_PATH}`;
+	}
+
+	public static pathPermitAnonymous(route: string | null = null): string {
+		return route
+			? `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.PERMIT_APPLICATION_ANONYMOUS}/${route}`
+			: `/${PersonalLicenceApplicationRoutes.MODULE_PATH}`;
+	}
+
+	public static pathPermitAuthenticated(route: string | null = null): string {
+		return route
+			? `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}/${route}`
+			: `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}`;
+	}
+}
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/personal-licence-application-routing.module.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/personal-licence-application-routing.module.ts
index c171486f6..d30ad8156 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/personal-licence-application-routing.module.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/modules/personal-licence-application/personal-licence-application-routing.module.ts
@@ -41,102 +41,7 @@ import { LicencePaymentSuccessComponent } from './components/shared/licence-paym
 import { LicenceUpdateReceivedSuccessComponent } from './components/shared/licence-update-received-success.component';
 import { PermitUpdateReceivedSuccessComponent } from './components/shared/permit-update-received-success.component';
 import { StepWorkerLicenceUserProfileComponent } from './components/shared/worker-licence-wizard-step-components/step-worker-licence-user-profile.component';
-
-export class PersonalLicenceApplicationRoutes {
-	public static readonly LICENCE_APPLICATION = 'personal-licence';
-
-	// AUTHENTICATED
-	public static readonly LICENCE_BASE = 'application';
-	public static readonly LICENCE_USER_APPLICATIONS_AUTHENTICATED = 'user-applications';
-
-	public static readonly LICENCE_RETURN_FROM_BL_SOLE_PROPRIETOR = 'return-user-applications';
-	public static readonly LICENCE_RETURN_FROM_BL_SOLE_PROPRIETOR_ANONYMOUS = 'return-user-applications-anonymous';
-
-	public static readonly LICENCE_FIRST_TIME_USER_TERMS = 'terms-and-conditions';
-	public static readonly LICENCE_FIRST_TIME_USER_SELECTION = 'user-selection';
-	public static readonly LICENCE_LINK = 'licence-link';
-	public static readonly LICENCE_LOGIN_USER_PROFILE = 'user-profile';
-
-	public static readonly WORKER_LICENCE_UPDATE_TERMS_AUTHENTICATED = 'licence-update-terms';
-	public static readonly WORKER_LICENCE_USER_PROFILE_AUTHENTICATED = 'licence-user-profile';
-
-	public static readonly PERMIT_UPDATE_TERMS_AUTHENTICATED = 'permit-update-terms';
-	public static readonly PERMIT_USER_PROFILE_AUTHENTICATED = 'permit-user-profile';
-
-	public static readonly PERMIT_NEW_AUTHENTICATED = 'permit-new';
-	public static readonly PERMIT_RENEWAL_AUTHENTICATED = 'permit-renew';
-	public static readonly PERMIT_UPDATE_AUTHENTICATED = 'permit-update';
-
-	public static readonly WORKER_LICENCE_NEW_AUTHENTICATED = 'worker-licence-new';
-	public static readonly WORKER_LICENCE_RENEWAL_AUTHENTICATED = 'worker-licence-renew';
-	public static readonly WORKER_LICENCE_UPDATE_AUTHENTICATED = 'worker-licence-update';
-	public static readonly WORKER_LICENCE_REPLACEMENT_AUTHENTICATED = 'worker-licence-replacement';
-
-	// ANONYMOUS
-	public static readonly LICENCE_APPLICATION_ANONYMOUS = 'personal-application-anonymous';
-	public static readonly LICENCE_APPLICATION_TYPE_ANONYMOUS = 'licence-application-type';
-	public static readonly LICENCE_ACCESS_CODE_ANONYMOUS = 'licence-access-code';
-
-	public static readonly WORKER_LICENCE_NEW_ANONYMOUS = 'worker-licence-new';
-	public static readonly WORKER_LICENCE_RENEWAL_ANONYMOUS = 'worker-licence-renewal';
-	public static readonly WORKER_LICENCE_REPLACEMENT_ANONYMOUS = 'worker-licence-replacement';
-	public static readonly WORKER_LICENCE_UPDATE_ANONYMOUS = 'worker-licence-update';
-
-	public static readonly PERMIT_APPLICATION_ANONYMOUS = 'permit-application-anonymous';
-	public static readonly PERMIT_ACCESS_CODE_ANONYMOUS = 'permit-access-code';
-	public static readonly PERMIT_TYPE_ANONYMOUS = 'permit-type';
-	public static readonly PERMIT_NEW_ANONYMOUS = 'permit-new';
-	public static readonly PERMIT_RENEWAL_ANONYMOUS = 'permit-renewal';
-	public static readonly PERMIT_UPDATE_ANONYMOUS = 'permit-update';
-
-	// PAYMENT
-	public static readonly PAYMENT_SUCCESS = 'payment-success';
-	public static readonly PAYMENT_FAIL = 'payment-fail';
-	public static readonly PAYMENT_CANCEL = 'payment-cancel';
-	public static readonly PAYMENT_ERROR = 'payment-error';
-	public static readonly LICENCE_UPDATE_SUCCESS = 'licence-update-success';
-	public static readonly PERMIT_UPDATE_SUCCESS = 'permit-update-success';
-
-	public static readonly MODULE_PATH = PersonalLicenceApplicationRoutes.LICENCE_APPLICATION;
-
-	public static path(route: string | null = null): string {
-		return route
-			? `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${route}`
-			: `/${PersonalLicenceApplicationRoutes.MODULE_PATH}`;
-	}
-
-	public static pathUserApplications(): string {
-		return `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}/${PersonalLicenceApplicationRoutes.LICENCE_USER_APPLICATIONS_AUTHENTICATED}`;
-	}
-
-	public static pathReturnFromBusinessLicenceSoleProprietor(): string {
-		return `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}/${PersonalLicenceApplicationRoutes.LICENCE_RETURN_FROM_BL_SOLE_PROPRIETOR}`;
-	}
-
-	public static pathSecurityWorkerLicenceAuthenticated(route: string | null = null): string {
-		return route
-			? `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}/${route}`
-			: `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}`;
-	}
-
-	public static pathSecurityWorkerLicenceAnonymous(route: string | null = null): string {
-		return route
-			? `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_APPLICATION_ANONYMOUS}/${route}`
-			: `/${PersonalLicenceApplicationRoutes.MODULE_PATH}`;
-	}
-
-	public static pathPermitAnonymous(route: string | null = null): string {
-		return route
-			? `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.PERMIT_APPLICATION_ANONYMOUS}/${route}`
-			: `/${PersonalLicenceApplicationRoutes.MODULE_PATH}`;
-	}
-
-	public static pathPermitAuthenticated(route: string | null = null): string {
-		return route
-			? `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}/${route}`
-			: `/${PersonalLicenceApplicationRoutes.MODULE_PATH}/${PersonalLicenceApplicationRoutes.LICENCE_BASE}`;
-	}
-}
+import { PersonalLicenceApplicationRoutes } from './personal-licence-application-routes';
 
 const routes: Routes = [
 	{
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address-and-is-same-flag.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address-and-is-same-flag.component.ts
index 715c97f93..9fd2e49cb 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address-and-is-same-flag.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address-and-is-same-flag.component.ts
@@ -5,27 +5,23 @@ import { FormControl, FormGroup } from '@angular/forms';
 	selector: 'app-address-and-is-same-flag',
 	template: `
 		<form [formGroup]="form" novalidate>
-			<div class="row">
-				<div class="col-md-12 col-sm-12 mb-3" [ngClass]="isWizardStep ? 'offset-lg-2 col-lg-8' : ''">
-					<mat-checkbox formControlName="isAddressTheSame">
-						{{ isAddressTheSameLabel }}
-					</mat-checkbox>
-					<ng-container *ngIf="!isAddressTheSame.value">
-						<mat-divider class="my-2 mat-divider-primary"></mat-divider>
-					</ng-container>
-				</div>
-			</div>
+			<mat-checkbox formControlName="isAddressTheSame">
+				{{ isAddressTheSameLabel }}
+			</mat-checkbox>
+			<ng-container *ngIf="!isAddressTheSame.value">
+				<mat-divider class="mt-2 mb-3 mat-divider-primary"></mat-divider>
+			</ng-container>
 		</form>
 
 		<ng-container *ngIf="!isAddressTheSame.value">
-			<app-address [form]="form" [isWizardStep]="isWizardStep" [isReadonly]="isReadonly"></app-address>
+			<app-address [form]="form" [isReadonly]="isReadonly" [isWideView]="isWideView"></app-address>
 		</ng-container>
 	`,
 	styles: [],
 })
 export class AddressAndIsSameFlagComponent implements OnInit {
 	@Input() form!: FormGroup;
-	@Input() isWizardStep = true;
+	@Input() isWideView = false;
 	@Input() isReadonly = false;
 	@Input() isCheckboxReadOnly = false;
 	@Input() isAddressTheSameLabel = 'The address is the same';
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address-autocomplete.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address-autocomplete.component.ts
index c72eed083..46497be6a 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address-autocomplete.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address-autocomplete.component.ts
@@ -45,7 +45,7 @@ export class Address {
 	template: `
 		<form [formGroup]="form">
 			<div class="row">
-				<div [ngClass]="isWizardStep ? 'col-xl-7 col-lg-12 col-md-12' : 'col-12'">
+				<div [ngClass]="isWideView ? 'col-xl-7 col-lg-12 col-md-12' : 'col-12'">
 					<mat-form-field>
 						<mat-label>Address by Canada Post</mat-label>
 						<input matInput formControlName="addressComplete" type="search" [matAutocomplete]="auto" />
@@ -76,7 +76,7 @@ export class Address {
 					</button>
 				</div>
 
-				<div [ngClass]="isWizardStep ? 'col-xl-5 col-lg-5 col-md-12' : 'col-12'">
+				<div [ngClass]="isWideView ? 'col-xl-5 col-lg-5 col-md-12' : 'col-12'">
 					<mat-form-field>
 						<mat-label>Country</mat-label>
 						<mat-select formControlName="country">
@@ -106,7 +106,8 @@ export class Address {
 export class AddressAutocompleteComponent implements OnInit {
 	@Output() autocompleteAddress: EventEmitter<Address> = new EventEmitter<Address>();
 	@Output() enterAddressManually: EventEmitter<boolean> = new EventEmitter<boolean>();
-	@Input() isWizardStep = true;
+	// @Input() isWizardStep = true;
+	@Input() isWideView = false;
 
 	form!: FormGroup;
 	addressAutocompleteFields!: AddressFindResponse[];
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address.component.ts
index 32af2d009..2f25294ba 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/address.component.ts
@@ -8,88 +8,81 @@ import { Address } from './address-autocomplete.component';
 	selector: 'app-address',
 	template: `
 		<form [formGroup]="form" novalidate>
-			<div class="row" *ngIf="!isReadonly">
-				<div class="" [ngClass]="isWizardStep ? 'offset-lg-2 col-lg-8 col-md-12 col-sm-12' : 'col-12'">
-					<app-address-form-autocomplete
-						[isWizardStep]="isWizardStep"
-						(autocompleteAddress)="onAddressAutocomplete($event)"
-						(enterAddressManually)="onEnterAddressManually()"
-					>
-					</app-address-form-autocomplete>
-					<mat-error
-						class="mat-option-error"
-						*ngIf="
-							(form.get('addressSelected')?.dirty || form.get('addressSelected')?.touched) &&
-							form.get('addressSelected')?.invalid &&
-							form.get('addressSelected')?.hasError('required')
-						"
-					>
-						This is required
-					</mat-error>
-				</div>
-			</div>
+			<ng-container *ngIf="!isReadonly">
+				<app-address-form-autocomplete
+					(autocompleteAddress)="onAddressAutocomplete($event)"
+					(enterAddressManually)="onEnterAddressManually()"
+					[isWideView]="isWideView"
+				>
+				</app-address-form-autocomplete>
+				<mat-error
+					class="mat-option-error"
+					*ngIf="
+						(form.get('addressSelected')?.dirty || form.get('addressSelected')?.touched) &&
+						form.get('addressSelected')?.invalid &&
+						form.get('addressSelected')?.hasError('required')
+					"
+				>
+					This is required
+				</mat-error>
+			</ng-container>
 
-			<div class="row">
-				<div class="col-md-12 col-sm-12" [ngClass]="isWizardStep ? 'offset-lg-2 col-lg-8' : ''">
-					<section *ngIf="form.get('addressSelected')?.value">
-						<div class="row">
-							<div class="col-12">
-								<mat-divider class="mat-divider-primary my-3" *ngIf="!isReadonly"></mat-divider>
-								<div class="text-minor-heading mb-2" *ngIf="isWizardStep">Address information</div>
-								<mat-form-field>
-									<mat-label>Street Address 1</mat-label>
-									<input matInput formControlName="addressLine1" [errorStateMatcher]="matcher" maxlength="100" />
-									<mat-error *ngIf="form.get('addressLine1')?.hasError('required')">This is required</mat-error>
-								</mat-form-field>
-							</div>
+			<section *ngIf="form.get('addressSelected')?.value">
+				<div class="row">
+					<mat-divider class="mat-divider-primary my-3" *ngIf="!isReadonly"></mat-divider>
+					<div [ngClass]="isWideView ? 'col-6' : 'col-12'">
+						<mat-form-field>
+							<mat-label>Street Address 1</mat-label>
+							<input matInput formControlName="addressLine1" [errorStateMatcher]="matcher" maxlength="100" />
+							<mat-error *ngIf="form.get('addressLine1')?.hasError('required')">This is required</mat-error>
+						</mat-form-field>
+					</div>
 
-							<div class="col-12">
-								<mat-form-field>
-									<mat-label>Street Address 2 <span class="optional-label">(optional)</span></mat-label>
-									<input matInput formControlName="addressLine2" maxlength="100" />
-								</mat-form-field>
-							</div>
-							<div class="col-md-6 col-sm-12">
-								<mat-form-field>
-									<mat-label>City</mat-label>
-									<input matInput formControlName="city" maxlength="100" />
-									<mat-error *ngIf="form.get('city')?.hasError('required')">This is required</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-md-6 col-sm-12">
-								<mat-form-field>
-									<mat-label>Postal/Zip Code</mat-label>
-									<input
-										matInput
-										formControlName="postalCode"
-										oninput="this.value = this.value.toUpperCase()"
-										maxlength="20"
-									/>
-									<mat-error *ngIf="form.get('postalCode')?.hasError('required')">This is required</mat-error>
-								</mat-form-field>
-							</div>
-							<div class="col-md-6 col-sm-12">
-								<mat-form-field>
-									<mat-label>Province/State</mat-label>
-									<input matInput formControlName="province" maxlength="100" />
-									<mat-error *ngIf="form.get('province')?.hasError('required')">This is required</mat-error>
-									<mat-error *ngIf="form.get('province')?.hasError('requiredValue')"
-										>This must be '{{ provinceOfBC }}'</mat-error
-									>
-								</mat-form-field>
-							</div>
-							<div class="col-md-6 col-sm-12">
-								<mat-form-field>
-									<mat-label>Country</mat-label>
-									<input matInput formControlName="country" maxlength="100" />
-									<mat-error *ngIf="form.get('country')?.hasError('required')">This is required</mat-error>
-									<mat-error *ngIf="form.get('country')?.hasError('requiredValue')">This must be 'Canada'</mat-error>
-								</mat-form-field>
-							</div>
-						</div>
-					</section>
+					<div [ngClass]="isWideView ? 'col-6' : 'col-12'">
+						<mat-form-field>
+							<mat-label>Street Address 2 <span class="optional-label">(optional)</span></mat-label>
+							<input matInput formControlName="addressLine2" maxlength="100" />
+						</mat-form-field>
+					</div>
+					<div class="col-md-6 col-sm-12">
+						<mat-form-field>
+							<mat-label>City</mat-label>
+							<input matInput formControlName="city" maxlength="100" />
+							<mat-error *ngIf="form.get('city')?.hasError('required')">This is required</mat-error>
+						</mat-form-field>
+					</div>
+					<div class="col-md-6 col-sm-12">
+						<mat-form-field>
+							<mat-label>Postal/Zip Code</mat-label>
+							<input
+								matInput
+								formControlName="postalCode"
+								oninput="this.value = this.value.toUpperCase()"
+								maxlength="20"
+							/>
+							<mat-error *ngIf="form.get('postalCode')?.hasError('required')">This is required</mat-error>
+						</mat-form-field>
+					</div>
+					<div class="col-md-6 col-sm-12">
+						<mat-form-field>
+							<mat-label>Province/State</mat-label>
+							<input matInput formControlName="province" maxlength="100" />
+							<mat-error *ngIf="form.get('province')?.hasError('required')">This is required</mat-error>
+							<mat-error *ngIf="form.get('province')?.hasError('requiredValue')"
+								>This must be '{{ provinceOfBC }}'</mat-error
+							>
+						</mat-form-field>
+					</div>
+					<div class="col-md-6 col-sm-12">
+						<mat-form-field>
+							<mat-label>Country</mat-label>
+							<input matInput formControlName="country" maxlength="100" />
+							<mat-error *ngIf="form.get('country')?.hasError('required')">This is required</mat-error>
+							<mat-error *ngIf="form.get('country')?.hasError('requiredValue')">This must be 'Canada'</mat-error>
+						</mat-form-field>
+					</div>
 				</div>
-			</div>
+			</section>
 		</form>
 	`,
 	styles: [],
@@ -99,7 +92,7 @@ export class AddressComponent implements OnInit {
 	provinceOfBC = SPD_CONSTANTS.address.provinceBC;
 
 	@Input() form!: FormGroup;
-	@Input() isWizardStep = true;
+	@Input() isWideView = false;
 	@Input() isReadonly = false;
 
 	ngOnInit(): void {
diff --git a/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/collection-notice.component.ts b/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/collection-notice.component.ts
index 793eb28fc..df89a4748 100644
--- a/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/collection-notice.component.ts
+++ b/src/Spd.Presentation.Licensing/ClientApp/src/app/shared/components/collection-notice.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
 @Component({
 	selector: 'app-collection-notice',
 	template: `
-		<app-alert type="info" icon="" [showBorder]="false">
+		<app-alert type="success" icon="" [showBorder]="false">
 			<div class="mb-2">COLLECTION NOTICE</div>
 			All information regarding this application is collected under the <i>{{ collectionNoticeActName }}</i> and its
 			Regulation and will be used for that purpose. The use of this information will comply with the