diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 00e33e0..5ad5eaf 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -11,15 +11,24 @@
     <meta name="description" content="{{ block "head-description" . }}{{ $.Site.Params.description | html }}{{ end }}">
     <meta name="twitter:dnt" content="on">    
     
-    <title itemprop="name">{{- block "title" . -}}{{- .Site.Title }} | {{ .Site.Params.tagline -}}{{- end -}}</title>
+    <title itemprop="name">
+      {{- block "title" . -}}
+        {{- .Site.Title -}}
+        {{- with .Site.Params.tagline -}}
+          {{- printf " | %s" . -}}
+        {{- end -}}
+      {{- end -}}
+    </title>
     
     <link rel="license" href="{{ block "head-license" . }}https://creativecommons.org/publicdomain/zero/1.0/{{ end }}">
     <link class="u-url u-uid" rel="me" href="{{ .Site.Home.Permalink }}">
     <link class="u-email" rel="me" href="mailto:me+bg@bengoldsworthy.net">
     <link class="u-url" rel="me" href="https://github.com/Rumperuu">
     <link class="u-url" rel="me" href="https://news.ycombinator.com/user?id=Rumperuu">
-    <link class="u-logo" rel="icon" sizes="192x192" href="/images/icon.png">      
-    <link class="u-key" rel="author" href="{{ .Site.Params.keyfile }}">
+    <link class="u-logo" rel="icon" sizes="192x192" href="/images/icon.png">  
+    {{- with .Site.Params.keyfile -}}    
+      <link class="u-key" rel="author" href="{{ . }}">
+    {{- end -}}
 
     <link rel="canonical" href="{{ .Permalink }}">
 
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 5509362..7f7c11a 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -85,7 +85,7 @@
                 {{- end -}}
               )
               {{- end -}}
-          <p>
+          </p>
         {{ end }}
       </div>
       
diff --git a/layouts/locations/list.html b/layouts/locations/list.html
index e395b4f..cd93bb3 100644
--- a/layouts/locations/list.html
+++ b/layouts/locations/list.html
@@ -75,8 +75,10 @@
 <article class="site-content__body site-content__body--chart">
     <div id="map" style="width: 100%; height: 500px; margin: 0; display: block;"></div>
 
+    {{- with ( partial "util/render_recursive_list.html" ( dict "sc" $ "pc" . "items" $.Site.Data.locations "schemaType" "Place" ) ) -}}
     <section style="grid-area: section-content">
-    {{- partial "util/render_recursive_list.html" ( dict "sc" $ "pc" . "items" $.Site.Data.locations "schemaType" "Place" ) -}}
+        {{- . -}}
     </section>
+    {{- end -}}
 </article>
 {{ end }}
diff --git a/layouts/partials/media/picture.html b/layouts/partials/media/picture.html
index 44dcc35..e0d605c 100644
--- a/layouts/partials/media/picture.html
+++ b/layouts/partials/media/picture.html
@@ -15,23 +15,22 @@
     class="picture"
     itemprop="image"
 >   
-    {{- if $isResizable -}}
-        <source srcset="{{- ($src.Resize "1200x webp").RelPermalink -}}" />
-        <source srcset="{{- ($src.Resize "800x png").RelPermalink -}}" media="(max-width: 800px)"/>
-    {{- end -}}
-   
+    {{ if $isResizable -}}
+    <source srcset="{{- ($src.Resize "1200x webp").RelPermalink -}}" />
+    <source srcset="{{- ($src.Resize "800x png").RelPermalink -}}" media="(max-width: 800px)"/>
+    {{- end }}
     <img 
         class="u-photo picture__image"
-        {{- if not $isResizable -}}
+        {{ if not $isResizable -}}
             src="{{- $src.RelPermalink -}}"
         {{- else -}}
             src="{{- ($src.Resize "1200x webp").RelPermalink -}}"
             width="{{- $src.Width -}}"
             height="{{- $src.Height -}}"
-        {{- end -}}
-        {{- with $src.Params.alt -}}alt="{{- . -}}"{{- end -}}
-        {{- with $src.Params.title -}}title="{{- . -}}" {{- end -}}
+        {{- end }}
+        {{ with $src.Params.alt -}}alt="{{- . -}}"{{- end }}
+        {{ with $src.Params.title -}}title="{{- . -}}" {{- end }}
         loading="lazy"
         role="img"
     />
-</picture>
\ No newline at end of file
+</picture>