diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 47f6d12..c179236 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,7 +1,8 @@
 {{ define "main" -}}
 
 <div class="row">
-  <div class="col-md-8">
+  {{- $mainwidth := or (and .Params.noSidebar "12") "8" -}}
+  <div class="col-md-{{ $mainwidth }}">
     <article class="card mt-3 mb-3" 
              itemscope itemtype="http://schema.org/BlogPosting">
       {{ if .Title -}}
@@ -20,12 +21,14 @@
         {{- end }}
       </header>
       {{- end }}
-      <div class="post-content card-body" itemprop="articleBody">
-        {{ .Content }}
-      </div>
+      {{ with .Content -}}
+      <div class="post-content card-body" itemprop="articleBody">{{ . }}</div>
+      {{- end }}
     </article>
   </div>
-  {{ partial "sidebar.html" . }}
+  {{ if not .Params.noSidebar -}}
+    {{ partial "sidebar.html" . }}
+  {{- end }}
 </div>
 
 {{ if eq .Site.Params.showChildArticles "cards" -}}
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index eb7693a..1cc5b34 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -25,7 +25,7 @@
     {{- end -}}
   {{- else if .Params.teaser -}}
   <div class="card mt-3">
-    <div class="card-body bg-light">
+    <div class="card-body">
       <h5 class="card-text">{{ .Params.teaser }}</h5>
     </div>
   </div>
@@ -35,7 +35,7 @@
        alt="Default Dmage">
   {{- else if .Params.Summary -}}
   <div class="card mt-3">
-    <div class="card-body bg-light">
+    <div class="card-body">
       <h5 class="card-text">{{ .Params.Summary }}</h5>
     </div>
   </div>