4 files changed, 10 insertions, 10 deletions
diff --git a/client/components/main/header.jade b/client/components/main/header.jade
index 510ef484..1185da85 100644
--- a/client/components/main/header.jade
+++ b/client/components/main/header.jade
@@ -10,13 +10,13 @@ template(name="header")
         #header-quick-access
           ul
             li
-              +linkTo(route="Boards")
+              a(href="{{pathFor 'home'}}")
                 span.fa.fa-home
                 | All boards
             each currentUser.starredBoards
               li.separator -
               li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
-                +linkTo(route="Board" data=this)
+                a(href="{{pathFor 'board' id=_id slug=slug}}")
                   = title
             else
               li.current Star a board to add a shortcut in this bar.
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 8e6ae941..2dd3b2f2 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -8,15 +8,15 @@ template(name="userFormsLayout")
   section.auth-layout
     h1.at-form-landing-logo
       img(src="/logo.png" title="LibreBoard")
-    +yield
+    +Template.dynamic(template=content)
 
 template(name="defaultLayout")
   #surface
     +header
     #content
-      +yield
+      +Template.dynamic(template=content)
 
-template(name="notfound")
+template(name="notFound")
   +message(label='page-not-found')
 
 template(name="message")
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
new file mode 100644
index 00000000..5dbd8c91
--- /dev/null
+++ b/client/components/main/layouts.js
@@ -0,0 +1,5 @@
+Meteor.subscribe('boards');
+
+Template.userFormsLayout.onRendered(function() {
+  EscapeActions.executeAll();
+});
diff --git a/client/components/main/router.js b/client/components/main/router.js
deleted file mode 100644
index bae832e8..00000000
--- a/client/components/main/router.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Router.route('/', {
-  name: 'Home',
-  redirectLoggedInUsers: true,
-  authenticated: true
-});