diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index d4fc2f338f7..325eeb3b26d 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 /* ---- CKEditor Minimal Reset ---- */
 .navbar.navbar-inverse .cke_chrome {
   border: none;
@@ -197,9 +197,6 @@ table.editorbar-panel td.selected {
   -webkit-transition: margin 250ms linear;
   width: 100%;
   z-index: 1000;
-  position: absolute;
-  background: rgba(153, 0, 255, 0.17);
-  border-radius: 3px;
 }
 .oe_drop_zone.oe_insert:first-child:not(:last-child) {
   margin-top: -8px;
@@ -231,6 +228,11 @@ table.editorbar-panel td.selected {
   position: absolute;
   margin: 0px !important;
 }
+.oe_drop_zone.oe_insert.oe_overlay {
+  position: absolute;
+  background: rgba(153, 0, 255, 0.17);
+  border-radius: 3px;
+}
 
 .oe_drop_zone {
   background: rgba(153, 0, 255, 0.17);
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 14c0c58ede3..28230889ab0 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -209,9 +209,9 @@ table.editorbar-panel
         position: absolute
         margin: 0px !important
     &.oe_overlay
-    position: absolute
-    background: rgba(153, 0, 255, 0.17)
-    border-radius: 3px
+        position: absolute
+        background: rgba(153, 0, 255, 0.17)
+        border-radius: 3px
 
 .oe_drop_zone
     background: rgba(153, 0, 255, 0.17)
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index a016cbc150b..362912b2e54 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -144,7 +144,7 @@ footer {
   padding-left: 16px;
 }
 
-div#wrap .carousel {
+div#wrap .carousel:first-child {
   top: -20px;
 }
 
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index a4b07b2969c..3b4b4727515 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -111,7 +111,7 @@ footer
     padding-left: 16px
 
 div#wrap
-    .carousel
+    .carousel:first-child
         top: -20px
 
 /* -- Hack for removing double scrollbar from mobile preview -- */
@@ -157,4 +157,4 @@ a[data-publish]
         top: -10px
         display: none
     /*&:hover > [data-publish]*/
-    /*     display: block*/
\ No newline at end of file
+    /*     display: block*/
diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js
index 36e72fcff60..0b8f4497282 100644
--- a/addons/website/static/src/js/website.snippets.js
+++ b/addons/website/static/src/js/website.snippets.js
@@ -304,7 +304,7 @@
         // selector.siblings -> will insert drop zones after and before selected elements
         activate_insertion_zones: function(selector){
             var self = this;
-            var child_selector = selector.childs ? this.parent_of_editable_box + (selector.childs).split(",").join(this.parent_of_editable_box) : false;
+            var child_selector = selector.childs;
             var sibling_selector = selector.siblings ? this.parent_of_editable_box + (selector.siblings).split(",").join(this.parent_of_editable_box) : false;
             var vertical_child_selector   =  selector.vertical_childs   ?  this.parent_of_editable_box + (selector.vertical_childs).split(",").join(this.parent_of_editable_box) : false;
 
@@ -876,4 +876,4 @@
         }
     });
 
-})();
\ No newline at end of file
+})();
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 188bb32aef7..c95509c789b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -166,7 +166,10 @@
                 <h3 class="panel-title">OpenERP Features</h3>
             </div>
             <div class="panel-body">
-                OpenERP's collaborative and realtime project management helps your team get work done. Keep track of everything, from the big picture to the minute details, from the customer contract to the billing.
+                OpenERP's collaborative and realtime project management helps
+                your team get work done. Keep track of everything, from the big
+                picture to the minute details, from the customer contract to
+                the billing.
             </div>
         </div>
     </div>
@@ -181,13 +184,13 @@
         <div class="oe_snippet_body container mt32"></div>
     </div>
 
-    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-action='insert' data-selector-siblings='.container'>
-        <div class='oe_snippet_thumbnail oe_label'>Main Title</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 class='oe_snippet_thumbnail oe_label'>Title</div>
         <section class="oe_snippet_body container">
             <div class="row">
                 <div class="col-md-12 text-center">
-                    <h1 class="mt64">Welcome To Your New Homepage,</h1>
-                    <h2 class="mt32 subheader">where <b><em>everything</em></b> can be customized </h2>
+                    <h1>Your Great Title</h1>
+                    <h2 class="text-muted">a slogan reinforcing the title</h2>
                 </div>
             </div>
         </section>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 2416d4739e3..1a4d4e9854d 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -205,8 +205,8 @@
     </template>
     <template id="recommended_products" inherit_id="website_sale.product" inherit_option_id="website_sale.product" name="Recommended Products">
         <xpath expr="//div[@id='product_detail']" position="inside">
-            <div class="well mt32" t-if="product.recommended_products()">
-                <h4>Customers who have bought this item also bought</h4>
+            <div class="mt32" t-if="product.recommended_products()">
+                <h3>Customers who have bought this product also bought:</h3>
                 <div class='row mt16' style="margin-left: 15px !important;">
                 <t t-foreach="product.recommended_products()" t-as="product">
                     <div class='col-md-2 thumbnail' style='width: 170px; margin-right: 16px;'>