diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index d379e12456b..2995a0e45c4 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,28 +3,6 @@
 {{ end }}
 
 {{ define "hero" }}
-<section class="hero">
-    <h5 class="text-white">
-      {{ range $product := $.Site.Sections }}
-        {{ range $version := .Sections }}
-          {{ range $language := .Sections }}
-            {{if $.CurrentSection}}
-              {{ if .IsAncestor $.CurrentSection }}
-                {{ .Params.shortTitle }}
-              {{end}}
-            {{end}}
-          {{end}}
-        {{end}}
-      {{end}}
-    </h5>
-    {{ with .Params.Title }}
-      <h1 class="m-t-0">{{ . }}</h1>
-    {{end}}
-
-    {{ with .Params.Author }}
-      <span class="byline bg-link">{{ . }}</span>
-    {{end}}
-</section>
 {{ end }}
 
 {{ define "main" }}
@@ -36,9 +14,14 @@
         {{ partial "docs-side-nav.html" . }}
       </aside>
 
-      <article class="{{ if ($.Scratch.Get "showSidebar") }} col-sm-6 {{else}} col-md-9 p-r-lg {{end}} col-xs-12">
+      <article class="{{ if ($.Scratch.Get "showSidebar") }} col-sm-6 {{else}} col-md-9 p-l-lg {{end}} col-xs-12">
 
-        <div class="main-content ">
+      {{ with .Params.Title }}
+        <h1 class="m-t-0">{{ . }}</h1>
+        <hr/>
+      {{end}}
+
+      <div class="main-content">
 
         {{ .Content }}
 
diff --git a/layouts/shortcodes/persistentdata.html b/layouts/shortcodes/persistentdata.html
index 38fa799cea4..26110d682b4 100644
--- a/layouts/shortcodes/persistentdata.html
+++ b/layouts/shortcodes/persistentdata.html
@@ -1,7 +1,7 @@
 <div>
 	<p>Rancher uses <code>etcd</code> as datastore. When using the Single Node Install, the embedded <code>etcd</code> is being used. The persistent data is at the following path in the container:  <code>/var/lib/rancher</code>. You can bind mount a host volume to this location to preserve data on the host it is running on.</p>
 
-	<p><b>Command</b></p>
+	<h5>Command:</h5>
 
 	<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
 docker run -d --restart=unless-stopped \
diff --git a/layouts/shortcodes/ssl_faq_ha.html b/layouts/shortcodes/ssl_faq_ha.html
index a8142f34d4a..84c0c8f7738 100644
--- a/layouts/shortcodes/ssl_faq_ha.html
+++ b/layouts/shortcodes/ssl_faq_ha.html
@@ -52,7 +52,7 @@ certutil -encode FILENAME FILENAME.base64
 
 <p>You can validate the certificate chain by using the <code>openssl</code> binary. If the output of the command (see the command example below) ends with <code>Verify return code: 0 (ok)</code>, your certificate chain is valid. The <code>ca.pem</code> file must be the same as you added to the <code>rancher/rancher</code> container. When using a certificate signed by a recognized Certificate Authority, you can omit the <code>-CAfile</code> parameter.</p>
 
-<p><strong>Command</strong></p>
+<h5>Command:</h5>
 <pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
 openssl s_client -CAfile ca.pem -connect rancher.yourdomain.com:443
 ...
diff --git a/layouts/shortcodes/ssl_faq_single.html b/layouts/shortcodes/ssl_faq_single.html
index 999810a4dd4..aa3d2acefae 100644
--- a/layouts/shortcodes/ssl_faq_single.html
+++ b/layouts/shortcodes/ssl_faq_single.html
@@ -34,7 +34,7 @@ VWQqljhfacYPgp8KJUJENQ9h5hZ2nSCrI+W00Jcw4QcEdCI8HL5wmg==
 
 <p>You can validate the certificate chain by using the <code>openssl</code> binary. If the output of the command (see the command example below) ends with <code>Verify return code: 0 (ok)</code>, your certificate chain is valid. The <code>ca.pem</code> file must be the same as you added to the <code>rancher/rancher</code> container. When using a certificate signed by a recognized Certificate Authority, you can omit the <code>-CAfile</code> parameter.</p>
 
-<p><strong>Command</strong></p>
+<h5>Command:</h5>
 <pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
 openssl s_client -CAfile ca.pem -connect rancher.yourdomain.com:443
 ...