diff --git a/templates/Includes/Content.ss b/templates/Includes/Content.ss
index 9e24c37..ff366ba 100755
--- a/templates/Includes/Content.ss
+++ b/templates/Includes/Content.ss
@@ -1,53 +1,49 @@
-<div class="page-content page-content-main">
-    <% if not $ExcludeHeader %>
-        <% include PageHeader %>
-    <% end_if %>
+<% if not $ExcludeHeader %>
+    <% include PageHeader %>
+<% end_if %>
 
-    <% if $CurrentElement %>
-        <%-- div class="element page-content-element">
-          <div class="element_container">
-            <div class="$DefaultContainer">
-                <div class="typography">$Content</div>
+<% if $CurrentElement %>
+    <%-- div class="element page-content-element">
+      <div class="element_container">
+        <div class="$DefaultContainer">
+            <div class="typography">$Content</div>
+        </div>
+      </div>
+    </div --%>
+
+    <div class="current-element">
+        $CurrentElement
+    </div>
+<% else %>
+    <% if $ElementalArea.Elements.Count %>
+        $ElementalArea
+    <% else_if $Content %>
+        <div class="element element_content_field dnadesign__elemental__models__elementcontent">
+            <div class="element-container {$DefaultContainer}">
+                <% include DNADesign\Elemental\Models\ElementContent HTML=$Content %>
             </div>
-          </div>
-        </div --%>
-    
-        <div class="current-element">
-            $CurrentElement
-        </div>
-    <% else %>
-        <div class="elemental-area">
-            <% if $ElementalArea.Elements.Count %>
-                $ElementalArea
-            <% else_if $Content %>
-                <div class="element element_content_field dnadesign__elemental__models__elementcontent">
-                    <div class="element-container {$DefaultContainer}">
-                        <% include DNADesign\Elemental\Models\ElementContent HTML=$Content %>
-                    </div>
-                </div>
-            <% end_if %>
         </div>
     <% end_if %>
+<% end_if %>
 
-    <% if $Form %>
-    <div class="page-form-element element">
+<% if $Form %>
+<div class="page-form-element element">
+    <div class="element_container">
+        <div class="$DefaultContainer">
+            $Form
+        </div>
+    </div>
+</div>
+<% end_if %>
+
+<% if $ExtraCode %>
+<div class="page-extra-code">
+    <div class="element">
         <div class="element_container">
             <div class="$DefaultContainer">
-                $Form
+                $ExtraCode
             </div>
         </div>
     </div>
-    <% end_if %>
-
-    <% if $ExtraCode %>
-    <div class="page-extra-code">
-        <div class="element">
-            <div class="element_container">
-                <div class="$DefaultContainer">
-                    $ExtraCode
-                </div>
-            </div>
-        </div>
-    </div>
-    <% end_if %>
 </div>
+<% end_if %>
diff --git a/templates/Includes/MainContent.ss b/templates/Includes/MainContent.ss
index 042f2a8..85ca7af 100755
--- a/templates/Includes/MainContent.ss
+++ b/templates/Includes/MainContent.ss
@@ -7,17 +7,16 @@
 	    </div>
 	<% end_if %>
 
-	<% if $URLSegment != 'home' %>
-	    <div id="PageBreadcumbs" class="element element__breadcrumbs">
-	        $Breadcrumbs
-	    </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">
@@ -35,6 +34,11 @@
 	    </div>
 	<% else %>
 	    <div class="content-holder">
+	    	<% if $URLSegment != 'home' %>
+			    <div id="PageBreadcumbs" class="element element__breadcrumbs">
+			        $Breadcrumbs
+			    </div>
+			<% end_if %>
 	        $Layout
 	    </div>
 	<% end_if %>