diff --git a/templates/layouts/layout-both-columns.tpl b/templates/layouts/layout-both-columns.tpl
index a89a686..02c37fa 100644
--- a/templates/layouts/layout-both-columns.tpl
+++ b/templates/layouts/layout-both-columns.tpl
@@ -37,70 +37,71 @@
       {hook h='displayAfterBodyOpeningTag'}
     {/block}
 
-    <main>
-      {block name='product_activation'}
-        {include file='catalog/_partials/product-activation.tpl'}
+    {block name='product_activation'}
+      {include file='catalog/_partials/product-activation.tpl'}
+    {/block}
+
+    <header class="relative z-30 flex items-center w-full">
+      {block name='header'}
+        {include file='_partials/header.tpl'}
+      {/block}
+    </header>
+
+    {block name='displayBeforeWrapper'}
+    {/block}
+
+    <section class="container mx-auto">
+      {block name='breadcrumb'}
+        {include file='_partials/breadcrumb.tpl'}
       {/block}
 
-      <header id="header">
-        {block name='header'}
-          {include file='_partials/header.tpl'}
-        {/block}
-      </header>
-
-      {block name='notifications'}
-        {include file='_partials/notifications.tpl'}
-      {/block}
-
-      <section id="wrapper">
+      {block name='wrapperTop'}
         {hook h="displayWrapperTop"}
-        <div class="container mx-auto px-4 md:px-0">
-          {if $page.page_name !== 'index'}
-            {block name='breadcrumb'}
-              {include file='_partials/breadcrumb.tpl'}
-            {/block}
+      {/block}
+
+      {block name="left_column"}
+        <div id="left-column" class="col-xs-12 col-sm-4 col-md-3">
+          {if $page.page_name == 'product'}
+            {hook h='displayLeftColumnProduct'}
+          {else}
+            {hook h="displayLeftColumn"}
           {/if}
-
-          {block name="left_column"}
-            <div id="left-column" class="col-xs-12 col-sm-4 col-md-3">
-              {if $page.page_name == 'product'}
-                {hook h='displayLeftColumnProduct'}
-              {else}
-                {hook h="displayLeftColumn"}
-              {/if}
-            </div>
-          {/block}
-
-          {block name="content_wrapper"}
-            <div id="content-wrapper" class="flex flex-col gap-8">
-              {hook h="displayContentWrapperTop"}
-              {block name="content"}
-                <p>Hello world! This is HTML5 Boilerplate.</p>
-              {/block}
-              {hook h="displayContentWrapperBottom"}
-            </div>
-          {/block}
-
-          {block name="right_column"}
-            <div id="right-column" class="col-xs-12 col-sm-4 col-md-3">
-              {if $page.page_name == 'product'}
-                {hook h='displayRightColumnProduct'}
-              {else}
-                {hook h="displayRightColumn"}
-              {/if}
-            </div>
-          {/block}
         </div>
+      {/block}
+
+      {block name="content_wrapper"}
+        <div id="content-wrapper" class="flex w-full">
+          {hook h="displayContentWrapperTop"}
+          {block name="content"}
+            <p>Hello world! This is HTML5 Boilerplate.</p>
+          {/block}
+          {hook h="displayContentWrapperBottom"}
+        </div>
+      {/block}
+
+      {block name="right_column"}
+        <div id="right-column" class="col-xs-12 col-sm-4 col-md-3">
+          {if $page.page_name == 'product'}
+            {hook h='displayRightColumnProduct'}
+          {else}
+            {hook h="displayRightColumn"}
+          {/if}
+        </div>
+      {/block}
+
+      {block name='wrapperBottom'}
         {hook h="displayWrapperBottom"}
-      </section>
+      {/block}
+    </section>
 
-      <footer id="footer">
-        {block name="footer"}
-          {include file="_partials/footer.tpl"}
-        {/block}
-      </footer>
+    {block name='displayAfterWrapper'}
+    {/block}
 
-    </main>
+    <footer id="footer" class="relative pt-20 lg:pt-24">
+      {block name="footer"}
+        {include file="_partials/footer.tpl"}
+      {/block}
+    </footer>
 
     {block name='javascript_bottom'}
       {include file="_partials/javascript.tpl" javascript=$javascript.bottom}