diff --git a/projects/nshmp-apps/src/app/dashboard/app.component.ts b/projects/nshmp-apps/src/app/dashboard/app.component.ts
index 3e9a33fcf43eefb51c0fafe66df7628254d526bb..fb0bbe4ecb495b20ee9524f7071838e49681cea6 100644
--- a/projects/nshmp-apps/src/app/dashboard/app.component.ts
+++ b/projects/nshmp-apps/src/app/dashboard/app.component.ts
@@ -8,12 +8,14 @@ import {
   NshmpLibNgTemplateComponent,
 } from '@ghsc/nshmp-lib-ng/nshmp';
 
+import {apps} from '../../shared/utils/applications.utils';
 import {
   designMapApps,
   gmmApps,
-  mainApps,
+  hazardApps,
   navigation,
   ncmApps,
+  serviceApps,
   sourceModelApps,
 } from '../../shared/utils/navigation.utils';
 import {AboutComponent} from './components/about/about.component';
@@ -45,22 +47,26 @@ export class AppComponent {
   private designMapApps = designMapApps();
   /** The GMM applications */
   private gmmApps = gmmApps();
-  /** The main applications */
-  private mainApps = mainApps();
+  /** Hazard applications */
+  private hazardApps = hazardApps();
   /** NCM apps  */
   private ncmApps = ncmApps();
   /** Source model applications */
   private sourceModelApps = sourceModelApps();
+  /** Service applications */
+  private serviceApps = serviceApps();
 
   sections: ApplicationSections[] = [
     {
       sections: [
         {
-          applications: this.mainApps.map(navigation => ({navigation})),
+          applications: this.hazardApps.map(navigation => ({navigation})),
+          routerLink: apps().hazard.dashboard.routerLink,
+          title: 'Hazard',
         },
         {
-          applications: this.designMapApps.map(navigation => ({navigation})),
-          title: 'Design Maps',
+          applications: this.serviceApps.map(navigation => ({navigation})),
+          title: 'Services',
         },
       ],
     },
@@ -68,14 +74,22 @@ export class AppComponent {
       sections: [
         {
           applications: this.sourceModelApps.map(navigation => ({navigation})),
+          routerLink: apps().source.dashboard.routerLink,
           title: 'Source Model',
         },
         {
           applications: this.gmmApps.map(navigation => ({navigation})),
+          routerLink: apps().gmm.dashboard.routerLink,
           title: 'Ground Motion Models',
         },
+        {
+          applications: this.designMapApps.map(navigation => ({navigation})),
+          routerLink: apps().designMaps.dashboard.routerLink,
+          title: 'Design Maps',
+        },
         {
           applications: this.ncmApps.map(navigation => ({navigation})),
+          routerLink: apps().ncm.dashboard.routerLink,
           title: 'National Crustal Model',
         },
       ],