diff --git a/layouts/_default/full.html b/layouts/_default/full.html
index 44ce15f..059b005 100644
--- a/layouts/_default/full.html
+++ b/layouts/_default/full.html
@@ -1,12 +1,11 @@
 <article class="{{ with .Section }}section-{{ . | urlize }}{{ end }} full-view">
 <header>
-<h2><a href="{{ .RelPermalink }}">{{ .Title }}</a></h2>
-<p class="submitted">
-{{ with $.Param "author" }}<span class="author">{{ . }}</span> – {{ end -}}
-<span class="created-date">{{ .Date.Format "2 January, 2006" }}</span>
-</p>
+<h2 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h2>
+{{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . -}}{{ end }}
 </header>
 <div>
 {{ .Content }}
 </div>
 </article>
+
+
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 7f7e839..b70eb4e 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -7,10 +7,7 @@
 <h1>{{ .Title }}</h1>
 <article class="{{ with .Section }}section-{{ . | urlize }}{{ end }} single-view">
 <header>
-<p class="submitted">
-{{ with $.Param "author" }}<span class="author">{{ . }}</span> – {{ end -}}
-<span class="created-date">{{ .Date.Format "2 January, 2006" }}</span>
-</p>
+{{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . -}}{{ end }}
 </header>
 <div>
 {{ .Content }}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index f95ed1f..81fc70c 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,10 +1,7 @@
 <article class="{{ with .Section }}section-{{ . | urlize }}{{ end }} list-view">
 <header>
-<h2><a href="{{ .RelPermalink }}">{{ .Title }}</a><h2>
-<p class="submitted">
-{{ with $.Param "author" }}<span class="author">{{ . }}</span> – {{ end -}}
-<span class="created-date">{{ .Date.Format "2 January, 2006" }}</span>
-</p>
+<h2 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h2>
+{{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . -}}{{ end }}
 </header>
 <div>
 {{ .Summary }}
diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index 66a95a8..74d8ccf 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -1,6 +1,6 @@
 {{ $domain := .Site.BaseURL | replaceRE "^https?://(www\\.)?([^/]+)/?" "$2" }}
 <form class="search-form" method="get" action="https://duckduckgo.com/">
-<input type="search" name="q" class="search-text" placeholder="Search this site…" title="Enter the terms you wish to search for." size="{{ $.Param "searchSize" | default "20" }}" maxlength="128">
+<input type="search" name="q" class="search-text" placeholder="Search" title="Enter the terms you wish to search for." size="{{ $.Param "searchSize" | default "20" }}" maxlength="128">
 <input type="hidden" name="sites" value="{{ $domain }}">
 <input type="submit" value="DuckDuckGo Search" class="hidden">
 </form>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index ca17e2c..15539f2 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -3,12 +3,14 @@
 <aside class="layout-3col__right-sidebar" role="complementary">
 {{ range $section, $taxonomy := .Site.Sections -}}
 {{ if ne $section "" -}}
+<section>
 <h4 class="menu"><a class="{{ if eq $currentSection $section }}active{{ end }}" href="/{{ urlize $section }}">{{ humanize $section }}</a></h4>
 <ul class="menu">
 {{ range $taxonomy.Pages -}}
 <li><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
 {{ end -}}
 </ul>
+</section>
 {{ end -}}
 {{ end -}}
 </aside>
diff --git a/layouts/partials/submitted.html b/layouts/partials/submitted.html
new file mode 100644
index 0000000..c3e58b6
--- /dev/null
+++ b/layouts/partials/submitted.html
@@ -0,0 +1,4 @@
+<p class="submitted">
+{{ with $.Param "author" }}<span class="author">{{ . }}</span> – {{ end -}}
+<span class="created-date">{{ .Date.Format "2 January, 2006" }}</span>
+</p>