diff --git a/layouts/partials/brand.html b/layouts/partials/brand.html
index a0c84e3..9dd58d1 100644
--- a/layouts/partials/brand.html
+++ b/layouts/partials/brand.html
@@ -1,6 +1,6 @@
 <header class="brand">
-  <h1>{{ .Site.Title}}</h1>
+  <a href="{{ .Site.BaseURL }}"><h1>{{ .Site.Title}}</h1></a>
   <h2>{{ .Site.Params.subtitle }}</h2>
   {{ partial "nav.html" . }}
-  <hr>
+  <hr />
 </header>
diff --git a/layouts/shortcodes/epigraph.html b/layouts/shortcodes/epigraph.html
index 2d60ad7..af992c9 100644
--- a/layouts/shortcodes/epigraph.html
+++ b/layouts/shortcodes/epigraph.html
@@ -5,7 +5,9 @@
 {{ if .IsNamedParams }}
 <footer>
 {{ with .Get "pre" }}{{ . }}{{ end }}
+{{ with .Get "link" }}<a href={{ . }}>{{ end }}
 {{ with .Get "cite" }}<cite>{{ . }}</cite>{{ end }}
+</a>
 {{ with .Get "post" }}{{ . }}{{ end }}
 </footer>
 {{ end }}
diff --git a/layouts/shortcodes/marginnote.html b/layouts/shortcodes/marginnote.html
index 57cc43e..9616ead 100644
--- a/layouts/shortcodes/marginnote.html
+++ b/layouts/shortcodes/marginnote.html
@@ -1,6 +1,12 @@
 {{ $marginnoteDomIdSuffix := .Ordinal }}
-<label for="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}">
-    class="margin-toggle">&#8853;
+<label
+  for="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}"
+  class="margin-toggle"
+  >&#8853;
 </label>
-<input type="checkbox" id="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}" class="margin-toggle" />
-<span class="marginnote">{{ .Inner }}</span>
\ No newline at end of file
+<input
+  type="checkbox"
+  id="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}"
+  class="margin-toggle"
+/>
+<span class="marginnote">{{ .Inner }}</span>