diff --git a/assets/style/main.sass b/assets/style/main.sass
index 76e3e62..53b0a0f 100644
--- a/assets/style/main.sass
+++ b/assets/style/main.sass
@@ -100,6 +100,12 @@ h6, .content h6
   @extend .px-3
   @extend .py-5
 
+.link-summary
+  @extend .has-background-link-light
+
+.note-summary
+  @extend .has-background-info-light
+
 .single
   @extend .my-5
   @extend .px-3
diff --git a/layouts/_default/frag/metadata.html b/layouts/_default/frag/metadata.html
new file mode 100644
index 0000000..9ea8d36
--- /dev/null
+++ b/layouts/_default/frag/metadata.html
@@ -0,0 +1,2 @@
+<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
+{{ partial "tags.html" .Params.tags }}
diff --git a/layouts/_default/frag/summary-content.html b/layouts/_default/frag/summary-content.html
new file mode 100644
index 0000000..ceea0ba
--- /dev/null
+++ b/layouts/_default/frag/summary-content.html
@@ -0,0 +1,4 @@
+{{ .Summary }}
+{{ if .Truncated }}
+<a href="{{ .RelPermalink }}">Read more...</a>
+{{ end }}
diff --git a/layouts/_default/frag/title.html b/layouts/_default/frag/title.html
new file mode 100644
index 0000000..c31f971
--- /dev/null
+++ b/layouts/_default/frag/title.html
@@ -0,0 +1 @@
+[{{ .Type | upper }}] {{ .Title }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 9c04ec7..692811e 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -4,16 +4,12 @@
 		<div class="container">
 			<div class="columns">
 				<div class="column is-8 is-offset-2">
-					<h1>
-						{{ if ne .Type "posts" }}[{{ .Type | upper }}]{{ end }}
-						{{ .Title }}
-					</h1>
+					<h1>{{ .Render "frag/title" }}</h1>
 				</div>
 			</div>
 			<div class="columns">
 				<div class="column is-2">
-					<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
-					{{ partial "tags.html" .Params.tags }}
+					{{ .Render "frag/metadata" }}
 				</div>
 				<div class="column is-8">
 					<div class="content">
@@ -21,7 +17,7 @@
 					</div>
 				</div>
 			</div>
-			{{ partial "comments.html" . }}
+			{{ partial "comments" . }}
 		</div>
 	</article>
 </main>
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 2da7c32..56a22dd 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,20 +1,19 @@
-<article class="summary">
+<article class="summary {{ .Type }}-summary">
 	<div class="container">
-		<div class="columns">
-			<div class="column is-8 is-offset-2">
-				<h2><a href="{{ .RelPermalink }}">{{ .Title }}</a></h1>
+		{{ if ne .Type "note" }}
+			<div class="columns">
+				<div class="column is-8 is-offset-2">
+					<h2><a href="{{ with .Params.link }}{{.}}{{ else }}{{ .RelPermalink }}{{ end }}">
+						{{ .Render "frag/title" }}</a></h2>
+				</div>
 			</div>
-		</div>
+		{{ end }}
 		<div class="columns">
 			<div class="column is-2">
-				<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
-				{{ partial "tags.html" .Params.tags }}
+				{{ .Render "frag/metadata" }}
 			</div>
-			<div class="column is-8">
-				{{ .Summary }}
-				{{ if .Truncated }}
-				<a href="{{ .RelPermalink }}">Read more...</a>
-				{{ end }}
+			<div class="column is-8 content">
+				{{ .Render "frag/summary-content" }}
 			</div>
 		</div>
 	</div>
diff --git a/layouts/index.html b/layouts/index.html
index ebae4e9..62ca803 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -17,6 +17,6 @@
 		{{ range $paginator.Pages }}
 			{{ .Render "summary" }}
 		{{ end }}
-		{{ partial "pagination.html" . }}
+		{{ partial "pagination" . }}
 	</main>
 {{ end }}
diff --git a/layouts/link/frag/summary-content.html b/layouts/link/frag/summary-content.html
new file mode 100644
index 0000000..48caa58
--- /dev/null
+++ b/layouts/link/frag/summary-content.html
@@ -0,0 +1,4 @@
+{{ .Content }}
+<p>
+    <a href="{{ .Params.link }}">&gt;&gt;&gt;</a>
+</p>
diff --git a/layouts/link/summary.html b/layouts/link/summary.html
deleted file mode 100644
index 6c71de1..0000000
--- a/layouts/link/summary.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<article class="summary link has-background-link-light">
-	<div class="container">
-		<div class="columns">
-			<div class="column is-8 is-offset-2">
-				<h2><a href="{{ .Params.link }}">[LINK] {{ .Title }}</a></h2>
-			</div>
-		</div>
-		<div class="columns">
-			<div class="column is-2">
-				<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
-				{{ partial "tags.html" .Params.tags }}
-			</div>
-			<div class="column is-8 content">
-				{{ .Content }}
-				<p>
-					<a href="{{ .Params.link }}">&gt;&gt;&gt;</a>
-				</p>
-			</div>
-		</div>
-	</div>
-</article>
diff --git a/layouts/note/frag/summary-content.html b/layouts/note/frag/summary-content.html
new file mode 100644
index 0000000..68a09ae
--- /dev/null
+++ b/layouts/note/frag/summary-content.html
@@ -0,0 +1 @@
+{{ .Content }}
diff --git a/layouts/note/summary.html b/layouts/note/summary.html
deleted file mode 100644
index 5e03ff2..0000000
--- a/layouts/note/summary.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<article class="summary note has-background-info-light">
-	<div class="container">
-		<div class="columns">
-			<div class="column is-2">
-				<time>{{ .Date.Format .Site.Params.DateFormat }}</time>
-				{{ partial "tags.html" .Params.tags }}
-			</div>
-			<div class="column is-8">
-				<div class="content">
-				{{ .Content }}
-				</div>
-			</div>
-		</div>
-	</div>
-</article>
diff --git a/layouts/page/frag/metadata.html b/layouts/page/frag/metadata.html
new file mode 100644
index 0000000..4fba398
--- /dev/null
+++ b/layouts/page/frag/metadata.html
@@ -0,0 +1 @@
+{{ partial "tags" .Params.tags }}
diff --git a/layouts/page/frag/title.html b/layouts/page/frag/title.html
new file mode 100644
index 0000000..dbae70d
--- /dev/null
+++ b/layouts/page/frag/title.html
@@ -0,0 +1 @@
+{{ .Title }}
diff --git a/layouts/page/single.html b/layouts/page/single.html
deleted file mode 100644
index d7a7cd4..0000000
--- a/layouts/page/single.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{{ define "main" }}
-<main>
-	<article class="single">
-		<div class="container">
-			<div class="columns">
-				<div class="column is-8 is-offset-2">
-					<h1>
-						{{ .Title }}
-					</h1>
-				</div>
-			</div>
-			<div class="columns">
-				<div class="column is-2">
-					{{ partial "tags.html" .Params.tags }}
-				</div>
-				<div class="column is-8">
-					<div class="content">
-						{{ .Content }}
-					</div>
-				</div>
-			</div>
-			{{ partial "comments.html" . }}
-		</div>
-	</article>
-</main>
-{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 48c1765..9a4afe0 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -2,7 +2,7 @@
 	<div class="container">
 		<div class="columns">
 			<footer class="column is-8 is-offset-2 has-text-centered">
-				{{ partial "social.html" . }}
+				{{ partial "social" . }}
 				<p>
 					&copy; {{ now.Year }}
 					<a href="{{ .Site.BaseURL }}">{{ .Site.Params.Author }}</a>
diff --git a/layouts/post/frag/title.html b/layouts/post/frag/title.html
new file mode 100644
index 0000000..dbae70d
--- /dev/null
+++ b/layouts/post/frag/title.html
@@ -0,0 +1 @@
+{{ .Title }}