diff --git a/templates/Includes/MainContent.ss b/templates/Includes/MainContent.ss
index 0795264..dad3319 100755
--- a/templates/Includes/MainContent.ss
+++ b/templates/Includes/MainContent.ss
@@ -1,45 +1,45 @@
 <div class="main-content main-content--{$CSSClass}">
-	<% if $HeroImageRecursive %>
-	    <div class="element element__hero-image">
-	        <div class="element-container">
-	            <% include SlideItem Image=$HeroImageRecursive, SlideWidth='2140', SlideHeight='450' %>
-	        </div>
-	    </div>
-	<% end_if %>
+    <% if $HeroImageRecursive %>
+        <div class="element element__hero-image">
+            <div class="element-container">
+                <% include SlideItem Image=$HeroImageRecursive, SlideWidth='2140', SlideHeight='450' %>
+            </div>
+        </div>
+    <% end_if %>
 
-	<% if $ShowSidebar %>
-	    <div class="content-holder content-holder__sidebar">
-	        <div class="{$DefaultContainer}">
-	            <div class="row">
-	                <div class="col-md-9 layout__col">
-	                	<% if $URLSegment != 'home' %>
-						    <div id="PageBreadcumbs" class="element element__breadcrumbs">
-						        $Breadcrumbs
-						    </div>
-						<% end_if %>
-	                    $Layout
-	                </div>
-	                <div class="col-md-3 sidebar__col">
-	                	<div class="{$DefaultContainer}">
-		                    <div class="page-content-sidebar page-content jsSidebarUI">
-		                        <div class="jsSidebarUI__inner">
-		                            $SideBarContent
-		                            $SideBarView
-		                        </div>
-		                    </div>
-		                </div>
-	                </div>
-	            </div>
-	        </div>
-	    </div>
-	<% else %>
-	    <div class="content-holder">
-	    	<% if $URLSegment != 'home' %>
-			    <div id="PageBreadcumbs" class="element element__breadcrumbs">
-			        $Breadcrumbs
-			    </div>
-			<% end_if %>
-	        $Layout
-	    </div>
-	<% end_if %>
+    <% if $SideBarContent || $SideBarView && $SideBarView.Widgets.Count %>
+        <div class="content-holder content-holder__sidebar">
+            <div class="{$DefaultContainer}">
+                <div class="row">
+                    <div class="col-md-9 layout__col">
+                        <% if $URLSegment != 'home' %>
+                            <div id="PageBreadcumbs" class="element element__breadcrumbs">
+                                $Breadcrumbs
+                            </div>
+                        <% end_if %>
+                        $Layout
+                    </div>
+                    <div class="col-md-3 sidebar__col">
+                        <div class="{$DefaultContainer}">
+                            <div class="page-content-sidebar page-content jsSidebarUI">
+                                <div class="jsSidebarUI__inner">
+                                    $SideBarContent
+                                    $SideBarView
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    <% else %>
+        <div class="content-holder">
+            <% if $URLSegment != 'home' %>
+                <div id="PageBreadcumbs" class="element element__breadcrumbs">
+                    $Breadcrumbs
+                </div>
+            <% end_if %>
+            $Layout
+        </div>
+    <% end_if %>
 </div>