diff --git a/main/template/default/layout/layout_1_col.tpl b/main/template/default/layout/layout_1_col.tpl
index 557bd8b0e9..2614ee815c 100644
--- a/main/template/default/layout/layout_1_col.tpl
+++ b/main/template/default/layout/layout_1_col.tpl
@@ -7,17 +7,25 @@
 {/block}
 {* 1 column *}
 {block name=body}
+    {* Content top *}
+
+    {if !empty($plugin_content_top)}         
+        <div id="plugin_content_top" class="span12">
+            {$plugin_content_top}
+        </div>
+    {/if}
+    
     <div class="span12">        
-        {include file="default/layout/page_body.tpl"}
-        {* Content bottom *}
+        {include file="default/layout/page_body.tpl"}        
+    </div>
+    
+    {* Content bottom *}
 
-        {if !empty($plugin_content_bottom)}   
-            <div class="clear"></div>
-            <div id="plugin_content_bottom">
-                {$plugin_content_bottom}
-            </div>
-        {/if}
-    </div>    
+    {if !empty($plugin_content_bottom)}               
+        <div id="plugin_content_bottom" class="span12">
+            {$plugin_content_bottom}
+        </div>
+    {/if}
 {/block}
 
 {* Footer *}
diff --git a/main/template/default/layout/layout_2_col.tpl b/main/template/default/layout/layout_2_col.tpl
index 2921da3c4e..0070c3f97a 100644
--- a/main/template/default/layout/layout_2_col.tpl
+++ b/main/template/default/layout/layout_2_col.tpl
@@ -13,8 +13,16 @@
 	{if $show_sniff == 1 }
 	 	{include file="default/layout/sniff.tpl"}
 	{/if}
-	
+    	
 	<div class="span9">		
+        {* Content bottom *}
+
+        {if !empty($plugin_content_top)}           
+            <div id="plugin_content_top">
+                {$plugin_content_top}
+            </div>
+        {/if}
+        
 		{* ?? *}
         <section id="home_page">
 		{$home_page_block}
@@ -39,8 +47,7 @@
         
         {* Content bottom *}
 
-        {if !empty($plugin_content_bottom)}   
-            <div class="clear"></div>
+        {if !empty($plugin_content_bottom)}               
             <div id="plugin_content_bottom">
                 {$plugin_content_bottom}
             </div>
diff --git a/main/template/default/layout/page_body.tpl b/main/template/default/layout/page_body.tpl
index 2248e8a13b..a84c6f1dc4 100644
--- a/main/template/default/layout/page_body.tpl
+++ b/main/template/default/layout/page_body.tpl
@@ -1,11 +1,3 @@
-{* Content top *}
-
-{if !empty($plugin_content_top)}         
-    <div id="plugin_content_top">
-        {$plugin_content_top}
-    </div>
-{/if}
-        
 {* Actions *}
 {if (!empty($actions)) }
     <div class="actions">
diff --git a/main/template/default/layout/show_footer.tpl b/main/template/default/layout/show_footer.tpl
index 420ab6d0d3..5d2244e70d 100644
--- a/main/template/default/layout/show_footer.tpl
+++ b/main/template/default/layout/show_footer.tpl
@@ -7,9 +7,8 @@
 {/if}
 {* Content bottom *}
 
-{if !empty($plugin_content_bottom)}   
-    <div class="clear"></div>
-    <div id="plugin_content_bottom">
+{if !empty($plugin_content_bottom)}       
+    <div id="plugin_content_bottom" class="span12">
         {$plugin_content_bottom}
     </div>
 {/if}
diff --git a/main/template/default/layout/show_header.tpl b/main/template/default/layout/show_header.tpl
index 20ed13d310..0276336aa9 100644
--- a/main/template/default/layout/show_header.tpl
+++ b/main/template/default/layout/show_header.tpl
@@ -3,7 +3,12 @@
     for backward compatibility we suppose that the default layout is one column which means ausing a div with class span12
 *}
 {include file="default/layout/main_header.tpl"}
-{if $show_header}    
+{if $show_header}
+        {if !empty($plugin_content_top)}         
+            <div id="plugin_content_top" class="span12">
+                {$plugin_content_top}
+            </div>
+        {/if}
         <div class="span12">
         {include file="default/layout/page_body.tpl"}
 {/if}
\ No newline at end of file