diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index cd5c775f..073289f9 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -129,15 +129,15 @@ const routes: Routes = [
       { path: 'server/:server_id/preferences/iou/templates', component: IouTemplatesComponent },
       { path: 'server/:server_id/preferences/iou/templates/:template_id', component: IouTemplateDetailsComponent },
       { path: 'server/:server_id/preferences/iou/templates/:template_id/copy', component: CopyIouTemplateComponent },
-      { path: 'server/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent },
-      {
-        path: '**',
-        component: PageNotFoundComponent
-      }
+      { path: 'server/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent }
     ]
   },
   { 
     path: 'server/:server_id/project/:project_id', component: ProjectMapComponent,
+  },
+  {
+    path: '**',
+    component: PageNotFoundComponent
   }
 ];
 
diff --git a/src/app/components/page-not-found/page-not-found.component.html b/src/app/components/page-not-found/page-not-found.component.html
index 9e68e1ba..0c777606 100644
--- a/src/app/components/page-not-found/page-not-found.component.html
+++ b/src/app/components/page-not-found/page-not-found.component.html
@@ -1,6 +1,6 @@
 <div class="content">
     <div class="default-header">
-        <h1>404 Page not found</h1>
+        <br/><h1>404 Page not found</h1>
         <button mat-button routerLink="/servers">Navigate to homepage</button>
     </div>
 </div>