Move site header layout styles to columns; fix nav spacing

Do a bit of testing on Chrome too.

layouts/partials/header.html

@@ -9,13 +9,18 @@
     <nav class="social">
       {{ with site.Menus.social }}
         {{- range . -}}
-        {{- $id := .Identifier -}}
-        {{- $targetBlank := .Params.targetBlank | default true -}}
-        <li id="social-menu-{{ $id }}">
-          <a href="{{ .URL }}" {{ if $targetBlank }}target="_blank"{{ end }} aria-label="{{ .Name }}">
-            <img alt="{{ .Name }}">
-          </a>
-        </li>
+          {{- $id := .Identifier -}}
+          {{- $targetBlank := .Params.targetBlank | default true -}}
+          <li id="social-menu-{{ $id }}">
+            <a
+              href="{{ .URL }}"
+              {{ if $targetBlank }}
+                target="_blank"
+              {{ end }}
+              aria-label="{{ .Name }}">
+              <img alt="{{ .Name }}" width=20 height=20>
+            </a>
+          </li>
         {{- end -}}
       {{ end }}
     </nav>

layouts/partials/site_nav.html

@@ -3,7 +3,15 @@
 <nav class="site bulleted">
 {{ with site.Menus.main }}
     {{- range . -}}
-    <li><a {{ if $currentPage.HasMenuCurrent "main" . }} class="active"{{ end }} href="{{ .URL }}"><span>{{ .Name }}</span></a></li>
+    <li>
+      <a
+        {{ if $currentPage.HasMenuCurrent "main" . }}
+          class="active"
+        {{ end }}
+        href="{{ .URL }}">
+        <span>{{ .Name }}</span>
+      </a>
+    </li>
     {{- end -}}
 {{ end }}
 </nav>