diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 385456aea26..e72a092c4f2 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -140,13 +140,13 @@ footer {
 }
 
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
-#wrap:empty, [data-oe-type=html]:empty {
+.oe_structure:empty, [data-oe-type=html]:empty {
   background-image: url("/website/static/src/img/drag_here.png");
   background-repeat: no-repeat;
   background-position: center top;
 }
 
-#wrap:empty:before, [data-oe-type=html]:empty:before {
+.oe_structure:empty:before, [data-oe-type=html]:empty:before {
   content: "Drag Building Blocks Here";
   text-align: center;
   display: block;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 482e6241075..c3528b3508c 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -102,12 +102,12 @@ footer
 
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 
-#wrap:empty, [data-oe-type=html]:empty
+.oe_structure:empty, [data-oe-type=html]:empty
     background-image: url('/website/static/src/img/drag_here.png')
     background-repeat: no-repeat
     background-position: center top
 
-#wrap:empty:before, [data-oe-type=html]:empty:before
+.oe_structure:empty:before, [data-oe-type=html]:empty:before
     content: 'Drag Building Blocks Here'
     text-align: center
     display: block
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index f367c3f297b..aa3080a4576 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -24,14 +24,14 @@
 
     <!-- Structure Snippets -->
 
-    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         
         <!-- editor bar to display inside the top edit bar -->
         <li class='oe_snippet_options'>
-            <a href="#" class="button js_add">Add layer</a>
+            <a href="#" class="button js_add">Add Slide</a>
         </li>
         <li class='oe_snippet_options'>
-            <a href="#" class="button js_remove">Remove current layer</a>
+            <a href="#" class="button js_remove">Remove Slide</a>
         </li>
         <li class='oe_snippet_options'>
             <a class="carousel-background">
@@ -139,7 +139,7 @@
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Title</div>
         <section class="oe_snippet_body container">
             <div class="row">
@@ -151,7 +151,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text-Image</div>
         <section class="oe_snippet_body dark">
             <div class="container">
@@ -178,7 +178,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Image-Text</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -204,7 +204,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Jumbotron</div>
         <section class="oe_snippet_body jumbotron mt16 mb16">
             <div class="container">
@@ -221,7 +221,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text Block</div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
@@ -250,7 +250,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Big Picture</div>
         <section class="oe_snippet_body dark mt16 mb16">
             <div class="container">
@@ -281,7 +281,7 @@
     </div>
 
 
-    <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Three Columns</div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
@@ -333,7 +333,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Image Gallery</div>
         <section class="oe_snippet_body">
             <div class="container">
diff --git a/addons/website/views/themes.xml b/addons/website/views/themes.xml
index 95fb0ec47ac..429f4bf00c1 100644
--- a/addons/website/views/themes.xml
+++ b/addons/website/views/themes.xml
@@ -8,7 +8,7 @@
 
     <template id="website.themes" name="Themes">
         <t t-call="website.layout">
-          <div class="container" t-if="editable">
+          <div class="container" id="wrap" t-if="editable">
     
             <div class="alert alert-success mt32" t-if="theme_changed">
                 <button type="button" class="close" data-dismiss="alert">&amp;times;</button>
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index dff4effa8be..485c1b9f9f2 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -97,7 +97,7 @@
                                 </div>
                             </div>
                         </header>
-                        <div t-raw="0" id="wrap"></div>
+                        <t t-raw="0"/>
                         <footer>
                             <div class="container" id="footer_container">
                                 <div class="row">
@@ -160,16 +160,21 @@
         </template>
 
         <template id="homepage" page="True">
-            <t t-call="website.layout"></t>
+            <t t-call="website.layout">
+              <div id="wrap" class="oe_structure"></div>
+            </t>
         </template>
 
         <template id="default_page">
-            <t t-call="website.layout"></t>
+            <t t-call="website.layout">
+              <div id="wrap" class="oe_structure"></div>
+            </t>
         </template>
 
 
         <template id="404">
             <t t-call="website.layout">
+              <div id="wrap">
                 <div class="container" t-if="editable and path">
                     <div class="well mt32">
                         <p>This page does not exists, but you can create it as you are administrator of this site.</p>
@@ -179,26 +184,31 @@
                     <div class="text-center text-muted">Edit the content bellow this line to adapt the default "page not found" page.</div>
                 </div>
                 <hr />
-                <div class="container">
-                    <h1 class="mt32">404: Page not found!</h1>
-                    <p>
-                        The page you were looking for could not be found; it is possible you have
-                        typed the address incorrectly, but it has most probably been removed due
-                        to the recent website reorganisation.
-                    </p>
-                    <p>Maybe you were looking for one of these popular pages ?</p>
-                    <ul>
-                        <li><a href="/">Homepage</a></li>
-                        <li><a href="/">Contact Us</a></li>
-                    </ul>
+                <div class="oe_structure">
+                    <div class="container">
+                        <h1 class="mt32">404: Page not found!</h1>
+                        <p>
+                            The page you were looking for could not be found; it is possible you have
+                            typed the address incorrectly, but it has most probably been removed due
+                            to the recent website reorganisation.
+                        </p>
+                        <p>Maybe you were looking for one of these popular pages ?</p>
+                        <ul>
+                            <li><a href="/">Homepage</a></li>
+                            <li><a href="/">Contact Us</a></li>
+                        </ul>
+                    </div>
                 </div>
+              </div>
             </t>
         </template>
 
         <template id="500">
             <t t-call="website.layout">
-                <div class="container">
-                    <h1 class="mt32">500: Internal Server Error!</h1>
+                <div id="wrap">
+                    <div class="oe_structure">
+                        <h1 class="container mt32">500: Internal Server Error!</h1>
+                    </div>
                     <pre t-if="editable" t-esc="traceback"/>
                 </div>
             </t>
@@ -206,9 +216,9 @@
 
         <template id="401">
             <t t-call="website.layout">
+              <div id="wrap">
                 <div class="container">
                     <h1 class="mt32">401: Unauthorized Access!</h1>
-
                     <p>
                         The page you were looking for could not be
                         authorized.
@@ -222,20 +232,22 @@
                         <li><a href="/">Contact Us</a></li>
                     </ul>
                 </div>
+              </div>
             </t>
         </template>
 
 
         <template id="contactus" name="Contact us" page="True">
             <t t-call="website.layout">
-                <t t-set="title">Contact us -
-                    <t t-raw="res_company.name"></t>
-                </t>
+              <t t-set="title">Contact us -
+                  <t t-raw="res_company.name"></t>
+              </t>
+              <div id="wrap">
                 <div class="container">
                     <h1>Contact us</h1>
                     <div class="row">
                         <div class="col-md-8">
-                            <div>
+                            <div class="oe_structure">
                                 <p>Contact us about anything related to our company or services.</p>
                                 <p>We'll do our best to get back to you as soon as possible.</p>
                             </div>
@@ -259,14 +271,15 @@
                         </div>
                     </div>
                 </div>
+              </div>
             </t>
         </template>
 
         <template id="aboutus" page="True">
             <t t-call="website.layout">
-                <t t-set="title">About us -
-                    <t t-raw="res_company.name"></t>
-                </t>
+              <t t-set="title">About <t t-raw="res_company.name"></t>
+              </t>
+              <div id="wrap" class="oe_structure">
                 <div class="container">
                     <h2>About us</h2>
                     <div class="row">
@@ -278,6 +291,7 @@
                         <div class="col-md-8"></div>
                     </div>
                 </div>
+              </div>
             </t>
         </template>
 
diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
index 9517e809ec2..040f2090eb9 100644
--- a/addons/website_contract/views/website_contract.xml
+++ b/addons/website_contract/views/website_contract.xml
@@ -16,10 +16,14 @@
     <template id="layout" name="References Layout">
         <t t-call="website.layout">
             <t t-set="title">References</t>
-            <div class="container">
-                <div class="row">
-                    <t t-raw="ref_content" />
+            <div id="wrap">
+                <div class="oe_structure"/>
+                <div class="container">
+                    <div class="row">
+                        <t t-raw="ref_content" />
+                    </div>
                 </div>
+                <div class="oe_structure"/>
             </div>
         </t>
     </template>
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index 8813112db3f..c90d9b3241e 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -47,21 +47,23 @@
         <template id="thanks">
             <t t-call="website.layout">
                 <t t-set="title">Message Sent</t>
-                <div class="container">
-                    <div class="alert alert-success">
-                        Your message has been sent successfully.
-                        <button type="button" class="close" data-dismiss="alert">&amp;times;</button>
-                    </div>
-                    <h2>Thanks!</h2>
-                    <p>
-                        We will get back to you shortly.
-                    </p><p class="mt64">
-                        If you have an emergency, do not hesitate to contact us by phone:
-                    </p>
-                    <ul class="list-unstyled">
-                        <li><i class="icon-phone"></i> : <span t-field="res_company.phone"/></li>
-                        <li><i class="icon-envelope"></i> : <span t-field="res_company.email"/></li>
-                    </ul>
+                <div id="wrap" class="oe_structure">
+                  <div class="container">
+                      <div class="alert alert-success">
+                          Your message has been sent successfully.
+                          <button type="button" class="close" data-dismiss="alert">&amp;times;</button>
+                      </div>
+                      <h2>Thanks!</h2>
+                      <p>
+                          We will get back to you shortly.
+                      </p><p class="mt64">
+                          If you have an emergency, do not hesitate to contact us by phone:
+                      </p>
+                      <ul class="list-unstyled">
+                          <li><i class="icon-phone"></i> : <span t-field="res_company.phone"/></li>
+                          <li><i class="icon-envelope"></i> : <span t-field="res_company.email"/></li>
+                      </ul>
+                  </div>
                 </div>
             </t>
         </template>
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index 1108d1db842..5b5542f4c4e 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -15,12 +15,15 @@
 
     <template id="layout" name="Partners Layout">
         <t t-call="website.layout">
-            <t t-set="title">Partners</t>
+          <t t-set="title">Partners</t>
+          <div id="wrap">
+            <div class="oe_structure"> </div>
             <div class="container">
                 <div class="row">
                     <t t-raw="ref_content" />
                 </div>
             </div>
+          </div>
         </t>
     </template>
 
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index b2c5f9f2917..02bc1c57b57 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -25,11 +25,14 @@
  
     <template id="index" name="Events" page="True">
         <t t-call="website.layout">
-            <t t-set="head">
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="title">Events</t>
-            <h1 class="text-center">Our Events</h1>
+          <t t-set="head">
+              <t t-raw="head or ''"/>
+          </t>
+          <t t-set="title">Events</t>
+          <div id="wrap">
+            <div class="oe_structure">
+                <h1 class="text-center">Our Events</h1>
+            </div>
             <div class="container">
                 <div class="row">
                     <div class="col-md-4 css_noprint" id="left_column">
@@ -86,6 +89,8 @@
                     </div>
                 </div>
             </div>
+            <div class="oe_structure"/>
+          </div>
         </t>
     </template>
 
@@ -116,11 +121,12 @@
 
     <template id="detail">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_event/static/src/js/website_event.js"></script>
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="title">Events</t>
+          <t t-set="head">
+              <script type="text/javascript" src="/website_event/static/src/js/website_event.js"></script>
+              <t t-raw="head or ''"/>
+          </t>
+          <t t-set="title">Events</t>
+          <div id="wrap">
             <div class="container">
                 <t t-call="website.publish"><t t-set="object" t-value="event_id"/></t>
                 <div class="row">
@@ -210,6 +216,7 @@
                     </div>
                 </div>
             </div>
+          </div>
         </t>
     </template>
  </data>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 018f5d0fb70..ea51cc3eafc 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -25,12 +25,13 @@
 
     <template id="index" name="Blogs" page="True">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_mail/static/src/js/blog.js"></script>
-                <link rel='stylesheet' href='/website_mail/static/src/css/blog.css'/>
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="title">Blog</t>
+          <t t-set="head">
+              <script type="text/javascript" src="/website_mail/static/src/js/blog.js"></script>
+              <link rel='stylesheet' href='/website_mail/static/src/css/blog.css'/>
+              <t t-raw="head or ''"/>
+          </t>
+          <t t-set="title">Blog</t>
+          <div id="wrap">
             <div class="container mt48 js_website_mail">
                 <div class="row">
                    <div class="col-md-4" id="left_column">
@@ -104,6 +105,7 @@
                     </div>
                 </div>
             </div>
+          </div>
         </t>
     </template>
 
diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml
index ac20a5bce2c..404bfd39764 100644
--- a/addons/website_membership/views/website_membership.xml
+++ b/addons/website_membership/views/website_membership.xml
@@ -16,10 +16,14 @@
     <template id="layout" name="Members Layout">
         <t t-call="website.layout">
             <t t-set="title">Partners</t>
-            <div class="container">
-                <div class="row">
-                    <t t-raw="ref_content" />
+            <div id="wrap">
+                <div class="oe_structure"> </div>
+                <div class="container">
+                    <div class="row">
+                        <t t-raw="ref_content" />
+                    </div>
                 </div>
+                <div class="oe_structure"> </div>
             </div>
         </t>
     </template>
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
index 1a0adb431a0..a3f7afc2cd5 100644
--- a/addons/website_project/views/website_project.xml
+++ b/addons/website_project/views/website_project.xml
@@ -34,7 +34,9 @@
 
     <template id="index" name="Project">
         <t t-call="website.layout">
-            <t t-set="title">Project</t>
+          <t t-set="title">Project</t>
+          <div id="wrap">
+            <div class="oe_structure"/>
             <div class="container">
                 <h4 t-field="project_id.name"/>
                 <t t-call="website.kanban">
@@ -46,6 +48,8 @@
                     <t t-set="scope">3</t>
                 </t>
             </div>
+            <div class="oe_structure"/>
+          </div>
         </t>
     </template>
 
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 2315d36bfee..e85922dcc7f 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -74,12 +74,15 @@
                 <t t-raw="head or ''"/>
             </t>
             <t t-set="title">Shop - <t t-raw="title">Categories</t></t>
-            <div class="container oe_website_sale">
-                <div class="row">
-                    <div class="col-md-12" id="shop_content">
-                        <t t-raw="shop_content" />
-                    </div>
-                </div>
+            <div id="wrap">
+              <div class="oe_structure"> </div>
+              <div class="container oe_website_sale">
+                  <div class="row">
+                      <div class="col-md-12" id="shop_content">
+                          <t t-raw="shop_content" />
+                      </div>
+                  </div>
+              </div>
             </div>
         </t>
     </template>
@@ -355,11 +358,12 @@
 
     <template id="checkout">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="title">Shop - Checkout</t>
+          <t t-set="head">
+              <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+              <t t-raw="head or ''"/>
+          </t>
+          <t t-set="title">Shop - Checkout</t>
+          <div id="wrap">
             <div class="container oe_website_sale">
                 <div class="row">
                     <div class="col-md-4">
@@ -536,16 +540,18 @@
                     </form>
                 </div>
             </div>
+          </div>
         </t>
     </template>
 
     <template id="payment">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="title">Shop - Payment</t>
+          <t t-set="head">
+              <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+              <t t-raw="head or ''"/>
+          </t>
+          <t t-set="title">Shop - Payment</t>
+          <div id="wrap">
             <div class="container oe_website_sale">
                 <div class="row">
                     <div class="col-md-4">
@@ -591,6 +597,7 @@
                     </div>
                 </div>
             </div>
+          </div>
         </t>
     </template>
  </data>