diff --git a/projects/nshmp-apps/src/shared/utils/navigation.utils.ts b/projects/nshmp-apps/src/shared/utils/navigation.utils.ts
index f612f749b1df41d7f997c99d6b1af6452affa3d0..d9a6082add1f324bb52489fe355d69373d4106d2 100644
--- a/projects/nshmp-apps/src/shared/utils/navigation.utils.ts
+++ b/projects/nshmp-apps/src/shared/utils/navigation.utils.ts
@@ -9,19 +9,14 @@ const DEV_APPS = ApplicationsUtils.devApps();
  * Returns the list of design map application.
  */
 export function designMapApps(): Navigation[] {
-  return [APPS.designMaps.rtgm];
+  return Object.values(APPS.designMaps) as Navigation[];
 }
 
 /**
  * Returns the list of AWS applications.
  */
 export function devAwsApps(): Navigation[] {
-  return [
-    DEV_APPS.aws.checkHazJobs,
-    DEV_APPS.aws.hazJobHistory,
-    DEV_APPS.aws.submitHazJobs,
-    DEV_APPS.aws.terminateHazJobs,
-  ];
+  return Object.values(DEV_APPS.aws) as Navigation[];
 }
 
 /**
@@ -53,17 +48,17 @@ export function devNavigation(): NavigationList[] {
 }
 
 /**
- * Returns list of hazard applications.
+ * Returns the list of ground motion model applications.
  */
-export function hazardApps(): Navigation[] {
-  return [APPS.hazard.disagg, APPS.hazard.dynamic, APPS.hazard.static];
+export function gmmApps(): Navigation[] {
+  return Object.values(APPS.gmm) as Navigation[];
 }
 
 /**
- * Returns the list of ground motion model applications.
+ * Returns list of hazard applications.
  */
-export function gmmApps(): Navigation[] {
-  return [APPS.gmm.distance, APPS.gmm.magnitude, APPS.gmm.spectra];
+export function hazardApps(): Navigation[] {
+  return Object.values(APPS.hazard) as Navigation[];
 }
 
 /**
@@ -87,7 +82,7 @@ export function navigation(): NavigationList[] {
       navigation: [APPS.dashboard],
     },
     {
-      navigation: [APPS.hazard.dashboard, ...hazardApps()],
+      navigation: hazardApps(),
       subHeader: 'Hazard',
     },
     {
@@ -118,12 +113,12 @@ export function navigation(): NavigationList[] {
  * Returns the list of NCM appliations.
  */
 export function ncmApps(): Navigation[] {
-  return [APPS.ncm.geophysicalProfiles];
+  return Object.values(APPS.ncm) as Navigation[];
 }
 
 /**
  * Returns the list of source model applicaitons.
  */
 export function sourceModelApps(): Navigation[] {
-  return [APPS.source.data, APPS.source.mfd, APPS.source.rateAndProbability];
+  return Object.values(APPS.source) as Navigation[];
 }