diff --git a/ui/src/app/layout/components/header/header.component.html b/ui/src/app/layout/components/header/header.component.html
index 8d7f286..6dcbe76 100644
--- a/ui/src/app/layout/components/header/header.component.html
+++ b/ui/src/app/layout/components/header/header.component.html
@@ -5,7 +5,7 @@
     </span>
     <ul class="nav ms-auto">
         <li class="nav-item">
-            <a class="nav-link" href="{{homePath}}"><i class="fa fa-home" aria-hidden="true"></i>&nbsp;Home</a>
+            <a class="nav-link" [routerLink]="[homePath]"><i class="fa fa-home" aria-hidden="true"></i>&nbsp;Home</a>
         </li>
         <li class="nav-item">
             <a class="nav-link" href="mailto:cg-admin@csiro.au?Subject=Auscope-App-Store"><i class="fa fa-envelope" aria-hidden="true"></i>&nbsp;Contact Us</a>
diff --git a/ui/src/app/shared/modules/page-header/page-header.component.html b/ui/src/app/shared/modules/page-header/page-header.component.html
index 88bf4c3..65c4400 100644
--- a/ui/src/app/shared/modules/page-header/page-header.component.html
+++ b/ui/src/app/shared/modules/page-header/page-header.component.html
@@ -5,7 +5,7 @@ <h2 class="page-header">
         </h2>
         <ol class="breadcrumb">
             <li class="breadcrumb-item">
-                <i class="fa fa-dashboard" aria-hidden="true"></i> <a href="Javascript:void(0)" [routerLink]="['/providerselection']">App Showcase</a>
+                <i class="fa fa-dashboard" aria-hidden="true"></i> <a [routerLink]="['/providerselection']">App Showcase</a>
             </li>
             <li class="breadcrumb-item active"><i class="fa {{icon}}" aria-hidden="true"></i> {{heading}}</li>
         </ol>
diff --git a/ui/src/app/shared/modules/provider-card/providercard.component.ts b/ui/src/app/shared/modules/provider-card/providercard.component.ts
index fd3911e..3aeaf8d 100644
--- a/ui/src/app/shared/modules/provider-card/providercard.component.ts
+++ b/ui/src/app/shared/modules/provider-card/providercard.component.ts
@@ -1,5 +1,6 @@
-import { Component, Input } from '@angular/core';
+import { Component, inject, Input } from '@angular/core';
 import { environment } from '../../../../environments/environment';
+import { Router } from '@angular/router';
 
 /**
  * Used to create a set of card on the screen which user can click on to select
@@ -12,6 +13,7 @@ import { environment } from '../../../../environments/environment';
     standalone: false
 })
 export class ProviderCardComponent {
+
     @Input() bgClass: string;
     @Input() icon: string;
     @Input() count: number;
@@ -23,6 +25,8 @@ export class ProviderCardComponent {
     @Input() pInfoMessage: string;
     @Input() srcUrl: string;
 
+    router = inject(Router);
+
     constructor() {
         // If this website sits in a subdirectory of web server's 'document root' directory
         if (environment.usePrePath) {
@@ -37,7 +41,7 @@ export class ProviderCardComponent {
      */
     public navigateToProvider(modelCount: number) {
         if (modelCount > 0) {
-            window.location.assign(this.prePath + '/provider/' + this.providerPath);
+            this.router.navigate([this.prePath + '/provider/' + this.providerPath]);
         }
     }
 
diff --git a/ui/src/assets/images/NVCL-Logo.png b/ui/src/assets/images/NVCL-Logo.png
new file mode 100644
index 0000000..3854b63
Binary files /dev/null and b/ui/src/assets/images/NVCL-Logo.png differ
diff --git a/ui/src/assets/images/ausis_map.png b/ui/src/assets/images/ausis_map.png
new file mode 100644
index 0000000..f3d7a13
Binary files /dev/null and b/ui/src/assets/images/ausis_map.png differ
diff --git a/ui/src/assets/images/nvcl_map.png b/ui/src/assets/images/nvcl_map.png
new file mode 100644
index 0000000..221256e
Binary files /dev/null and b/ui/src/assets/images/nvcl_map.png differ