diff --git a/web-app/admin/src/ng1/app.js b/web-app/admin/src/ng1/app.js
index e1ab7cf4b..fb0edf4d6 100644
--- a/web-app/admin/src/ng1/app.js
+++ b/web-app/admin/src/ng1/app.js
@@ -137,7 +137,7 @@ function config($httpProvider, $stateProvider, $urlRouterProvider, $animateProvi
     };
   }
 
-  $urlRouterProvider.otherwise('/');
+  $urlRouterProvider.otherwise('/admin');
 
   $stateProvider.state('admin', {
     redirectTo: 'admin.dashboard',
diff --git a/web-app/admin/src/ng1/navbar/navbar.component.html b/web-app/admin/src/ng1/navbar/navbar.component.html
index 24f9530c3..d5a7cbb09 100644
--- a/web-app/admin/src/ng1/navbar/navbar.component.html
+++ b/web-app/admin/src/ng1/navbar/navbar.component.html
@@ -3,30 +3,22 @@
     <section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-start">
       <a class="material-icons mdc-top-app-bar__navigation-icon mobile-only" ng-click="$ctrl.openMenu = !$ctrl.openMenu">menu</a>
       <button class="material-icons mdc-icon-button" ng-if="$ctrl.state === 'map'" ng-click="$ctrl.toggleFeed()">menu</button>
-      <button class="mdc-button top-app-bar-button" onclick="window.location.href='#/map'">
+      <a class="mdc-button top-app-bar-button" href="/#/home">
         <span class="mdc-top-app-bar__title">MAGE</span>
-      </button>
+      </a>
     </section>
     <section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-end">
       <div class="mage-tooltip">
-        <button class="mdc-button top-app-bar-button" onclick="window.location.href='#/profile'">
+        <a class="mdc-button top-app-bar-button" href="/#/profile">
           <span class="mdc-button__icon">
             <user-avatar [user]="$ctrl.myself" avatar-width="25" avatar-height="25"></user-avatar>
           </span>
           <span style="padding-left: 10px;" class="mdc-button__label">{{$ctrl.myself.displayName}}</span>
-        </button>
+        </a>
         <span class="tooltiptext">My Profile</span>
       </div>
-      <div class="mage-tooltip" ng-if="$ctrl.hasAdminPermission">
-        <button class="material-icons mdc-icon-button"
-          aria-label="Admin" 
-          data-tooltip="Admin" 
-          onclick="window.location.href='#/admin'">settings
-        </button>
-        <span class="tooltiptext">Administration Options</span>
-      </div>
       <div class="mage-tooltip">
-        <button class="material-icons mdc-icon-button" aria-label="About" onclick="window.location.href='#/about'">info</button>
+        <a class="material-icons mdc-icon-button" aria-label="About" href="/#/about">info</a>
         <span class="tooltiptext">About MAGE</span>
       </div>
       <div class="mage-tooltip">
diff --git a/web-app/package.json b/web-app/package.json
index df44cd76f..3d82834f0 100644
--- a/web-app/package.json
+++ b/web-app/package.json
@@ -29,7 +29,7 @@
   "scripts": {
     "start:app": "ng serve --project=app --configuration development",
     "start:admin": "ng serve --project=admin --configuration development",
-    "build": "npm-run-all clean build:core-lib build:app:dev build:admin:dev",
+    "build": "npm-run-all clean build:core-lib build:app:dev build:admin:dev combine",
     "build:prod": "npm-run-all clean build:core-lib build:app:prod build:app:prod",
     "build:app:dev": "ng build --project=app --configuration development",
     "build:admin:dev": "ng build --project=admin --configuration development",
diff --git a/web-app/src/app/app.module.ts b/web-app/src/app/app.module.ts
index 9eb8ade48..0e0046dd6 100644
--- a/web-app/src/app/app.module.ts
+++ b/web-app/src/app/app.module.ts
@@ -1,7 +1,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule, ApplicationRef, DoBootstrap } from '@angular/core';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { CommonModule } from '@angular/common';
+import { CommonModule, HashLocationStrategy, LocationStrategy } from '@angular/common';
 import { AppComponent } from './app.component';
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import { MatDialogModule } from '@angular/material/dialog';
@@ -25,6 +25,7 @@ import { TokenInterceptorService } from './http/token.interceptor';
   providers: [
     LocalStorageService,
     TokenInterceptorService,
+    { provide: LocationStrategy, useClass: HashLocationStrategy },
     { provide: HTTP_INTERCEPTORS, useClass: TokenInterceptorService, multi: true }
   ]
 })
diff --git a/web-app/src/app/navigation/navigation.component.html b/web-app/src/app/navigation/navigation.component.html
index 92f36f54c..4360ebc0b 100644
--- a/web-app/src/app/navigation/navigation.component.html
+++ b/web-app/src/app/navigation/navigation.component.html
@@ -27,7 +27,7 @@
         <mat-icon>file_download</mat-icon>
       </button>
 
-      <a mat-button href="/mage-admin/admin">
+      <a mat-button href="admin/#/admin/">
         <mat-icon>admin_panel_settings</mat-icon>
       </a>