diff --git a/src/views/layout.js b/src/views/layout.js
index 50c9acba081a86e91ae962c8f42d6834d0e8e8a1..00d9d7ace6230e36b68cab4f6c366fc10ca72a88 100644
--- a/src/views/layout.js
+++ b/src/views/layout.js
@@ -7,28 +7,29 @@ module.exports = {
     if (auth.authenticated === false) {
       return m('div', [
         m('nav', [
-          m('a', { href: '/' }, 'AMIV'),
-          m('a', { href: '/#!/events' }, 'Events'),
-          m('a', { href: '/#!/studydocuments' }, 'Studienunterlagen'),
-          m('a', { href: '/#!/jobs' }, 'Jobs'),
-          m('a', { href: '/#!/login' }, 'Login'),
+          m('a', { href: '/', oncreate: m.route.link }, 'AMIV'),
+          m('a', { href: '/events', oncreate: m.route.link }, 'Events'),
+          m('a', { href: '/studydocuments', oncreate: m.route.link }, 'Studienunterlagen'),
+          m('a', { href: '/jobs', oncreate: m.route.link }, 'Jobs'),
+          m('a', { href: '/login', oncreate: m.route.link }, 'Login'),
         ]),
         m('main', vnode.children),
       ]);
     }
     return m('div', [
       m('nav', [
-        m('a', { href: '/' }, 'AMIV'),
-        m('a', { href: '/#!/events' }, 'Events'),
-        m('a', { href: '/#!/studydocuments' }, 'Studienunterlagen'),
-        m('a', { href: '/#!/jobs' }, 'Jobs'),
-        m('a', { href: '/#!/profile' }, 'Profil'),
+        m('a', { href: '/', oncreate: m.route.link }, 'AMIV'),
+        m('a', { href: '/events', oncreate: m.route.link }, 'Events'),
+        m('a', { href: '/studydocuments', oncreate: m.route.link }, 'Studienunterlagen'),
+        m('a', { href: '/jobs', oncreate: m.route.link }, 'Jobs'),
+        m('a', { href: '/profile', oncreate: m.route.link }, 'Profil'),
         m('a', {
-          href: '#',
+          href: '/',
           onclick: () => {
             auth.logout();
             return false;
           },
+          oncreate: m.route.link,
         }, 'Logout'),
       ]),
       m('main', vnode.children),