diff --git a/src/App.vue b/src/App.vue
index f787a95b..08a97287 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,12 +25,12 @@
 				<div class="box">
 					<div class="columns">
 						<div class="column is-3">
-								<a class="button is-success is-fullwidth button-bottom">
+								<router-link :to="{name: 'newNamespace'}" class="button is-success is-fullwidth button-bottom">
 									<span class="icon is-small">
-										<icon icon="plus"/>
+										<icon icon="layer-group"/>
 									</span>
 									New Namespace
-								</a>
+								</router-link>
 							<aside class="menu">
 								<p class="menu-label" v-if="loading">Loading...</p>
 								<template v-for="n in namespaces">
diff --git a/src/main.js b/src/main.js
index b5c82a72..54458a17 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,6 +19,7 @@ import { faListOl } from '@fortawesome/free-solid-svg-icons'
 import { faTasks } from '@fortawesome/free-solid-svg-icons'
 import { faCog } from '@fortawesome/free-solid-svg-icons'
 import { faAngleRight } from '@fortawesome/free-solid-svg-icons'
+import { faLayerGroup } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 
 library.add(faSignOutAlt)
@@ -27,6 +28,7 @@ library.add(faListOl)
 library.add(faTasks)
 library.add(faCog)
 library.add(faAngleRight)
+library.add(faLayerGroup)
 
 Vue.component('icon', FontAwesomeIcon)
 
diff --git a/src/router/index.js b/src/router/index.js
index f4b52231..547b9f11 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,6 +8,8 @@ import RegisterComponent from '@/components/user/Register'
 // List Handling
 import ShowListComponent from '@/components/lists/ShowList'
 import NewListComponent from '@/components/lists/NewList'
+// Namespace Handling
+import NewNamespaceComponent from '@/components/namespaces/NewNamespace'
 
 Vue.use(Router)
 
@@ -34,9 +36,14 @@ export default new Router({
       component: ShowListComponent
     },
     {
-      path: '/namespaces/:id',
+      path: '/namespaces/:id/list',
       name: 'newList',
       component: NewListComponent
+    },
+    {
+      path: '/namespaces/new',
+      name: 'newNamespace',
+      component: NewNamespaceComponent
     }
   ]
 })
\ No newline at end of file