diff --git a/src/components/Logo.vue b/src/components/Logo.vue
new file mode 100644
index 0000000..80702ff
--- /dev/null
+++ b/src/components/Logo.vue
@@ -0,0 +1,15 @@
+<template>
+	<g-link class="logo" to="/">
+	  <span class="logo__text">
+	    {{ $static.metaData.siteName }}
+	  </span>
+	</g-link>
+</template>
+
+<static-query>
+query {
+  metaData {
+    siteName
+  }
+}
+</static-query>
\ No newline at end of file
diff --git a/src/layouts/Default.vue b/src/layouts/Default.vue
index 436c6cb..dac522c 100644
--- a/src/layouts/Default.vue
+++ b/src/layouts/Default.vue
@@ -3,13 +3,9 @@
 
     <header class="header">
       <div class="header__left">
-
-        <g-link v-if="showLogo" class="logo" to="/">
-          <span class="logo__text">
-            {{ $static.metaData.siteName }}
-          </span>
-        </g-link>
+        <Logo v-if="showLogo" /> 
       </div>
+      
       <div class="header__right">        
         <ToggleTheme />
       </div>
@@ -27,15 +23,8 @@
   </div>
 </template>
 
-<static-query>
-query {
-  metaData {
-    siteName
-  }
-}
-</static-query>
-
 <script>
+import Logo from '~/components/Logo.vue'
 import ToggleTheme from '~/components/ToggleTheme.vue'
 
 export default {
@@ -43,6 +32,7 @@ export default {
     showLogo: { default: true }
   },
   components: {
+    Logo,
     ToggleTheme
   }
 }
diff --git a/src/pages/Index.vue b/src/pages/Index.vue
index 3e96a8e..59c3407 100644
--- a/src/pages/Index.vue
+++ b/src/pages/Index.vue
@@ -1,8 +1,10 @@
 <template>
   <Layout :show-logo="false">
     
+    <!-- Author intro -->
     <Author :site-title="$static.metaData.siteName" />
     
+    <!-- List posts -->
     <div class="posts">
       <PostCard v-for="edge in $page.posts.edges" :key="edge.node.id" :post="edge.node"/>
     </div>
diff --git a/src/templates/Post.vue b/src/templates/Post.vue
index a56c5a5..15c4f5e 100644
--- a/src/templates/Post.vue
+++ b/src/templates/Post.vue
@@ -50,7 +50,6 @@ query Post ($path: String!) {
 </page-query>
 
 <style lang="scss">
-
 .post-title {
 	padding: calc(var(--space) / 2) 0 var(--space);
 	text-align: center;
@@ -81,6 +80,7 @@ query Post ($path: String!) {
 
 .post-comments {
 	padding: calc(var(--space) / 2);
+	
 	&:empty {
 		display: none;
 	}
diff --git a/src/templates/Tag.vue b/src/templates/Tag.vue
index 6f23a1f..36aad61 100644
--- a/src/templates/Tag.vue
+++ b/src/templates/Tag.vue
@@ -1,14 +1,10 @@
 <template>
   <Layout>
-    
-    <!-- This template shows a template archive -->
-
     <h1 class="tag-title text-center space-bottom">Tag: {{ $page.tag.title }}</h1>
 
     <div class="posts">
       <PostCard v-for="edge in $page.tag.belongsTo.edges" :key="edge.node.id" :post="edge.node"/>
     </div>
-
   </Layout>
 </template>