diff --git a/assets/js/components/Navbar.vue b/assets/js/components/Navbar.vue
index c2e2eaf2..76809fd0 100644
--- a/assets/js/components/Navbar.vue
+++ b/assets/js/components/Navbar.vue
@@ -1,12 +1,10 @@
 <template>
-    <div class="navbar border-bottom border-b border-grey-light mb-6" role="banner">
+    <div role="banner">
         <header class="container mx-auto px-4">
             <div class="sm:flex">
                 <div class="w-full sm:w-1/3 lg:w-1/4 flex items-center">
                     <div class="w-3/4 py-5">
-                        <a href="/" title="Home" class="text-grey-darkest no-underline hover:underline">
-                            {{ siteName }}
-                        </a>
+                        {{ siteName }}
                     </div>
 
                     <div class="w-1/4 text-right sm:hidden">
diff --git a/assets/sass/app.sass b/assets/sass/app.sass
index b1b4d2f4..e7ea5192 100644
--- a/assets/sass/app.sass
+++ b/assets/sass/app.sass
@@ -5,6 +5,7 @@
 
 @import 'base/base'
 @import 'base/images'
+@import 'base/vue'
 
 @import 'components/blockquote'
 @import 'components/button'
diff --git a/assets/sass/base/vue.sass b/assets/sass/base/vue.sass
new file mode 100644
index 00000000..54492e7d
--- /dev/null
+++ b/assets/sass/base/vue.sass
@@ -0,0 +1,20 @@
+[v-cloak]
+    .v-cloak-block
+        display: block
+
+    .v-cloak-inline
+        display: inline
+
+    .v-cloak-inline-block
+        display: inline-block
+
+    .v-cloak-hidden
+        display: none
+
+    .v-cloak-invisible
+        visibility: hidden
+
+.v-cloak-block,
+.v-cloak-inline,
+.v-cloak-inline-block
+    display: none
diff --git a/source/_layouts/app.html.twig b/source/_layouts/app.html.twig
index 1626dc48..dc1c8446 100644
--- a/source/_layouts/app.html.twig
+++ b/source/_layouts/app.html.twig
@@ -31,7 +31,7 @@
         {% endfor %}
     </head>
     <body class="font-sans text-black text-sm leading-normal">
-        <div id="app">
+        <div id="app" v-cloak>
             {% block body %}{% endblock %}
         </div>
 
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index f7bab3bc..f4aca320 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -1,7 +1,7 @@
 {% extends 'app' %}
 
 {% block body %}
-    <navbar site-name="{{ site.title }}" page-url="{{ page.url }}"></navbar>
+    {% include 'layout/navbar' %}
 
     <div class="container mx-auto px-4">
         <div class="md:flex -mx-4">
diff --git a/source/_partials/layout/navbar.html.twig b/source/_partials/layout/navbar.html.twig
new file mode 100644
index 00000000..c36aa051
--- /dev/null
+++ b/source/_partials/layout/navbar.html.twig
@@ -0,0 +1,7 @@
+<div class="border-bottom border-b border-grey-light mb-6">
+    <div class="container mx-auto v-cloak-block">
+        <div class="block py-5">{{ site.title }}</div>
+    </div>
+
+    <navbar site-name="{{ site.title }}" page-url="{{ page.url }}"></navbar>
+</div>
