diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index e0c8dadd8e2..451f0140978 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -129,6 +129,9 @@
 .oe_snippet > * {
   pointer-events: none;
 }
+.oe_snippet > :not(.oe_snippet_body):not(.oe_snippet_thumbnail) {
+  display: none !important;
+}
 .oe_snippet > *:first-child:not(.oe_snippet_thumbnail) {
   display: block;
   -webkit-transform-origin-x: 5px;
@@ -192,28 +195,26 @@
   opacity: 0;
   transition: opacity 100ms linear;
   box-sizing: border-box;
+  pointer-events: none;
 }
-.oe_snippet_manipulator > .oe_handle {
+.oe_snippet_manipulator .oe_handle {
   display: none;
 }
 .oe_snippet_manipulator.oe_hover {
   opacity: 1;
   cursor: pointer;
 }
-.oe_snippet_manipulator.oe_selected {
+.oe_snippet_manipulator.oe_selected, .oe_snippet_manipulator.oe_active {
   opacity: 1;
-  pointer-events: none;
   background: transparent;
   border: dashed 1px rgba(153, 0, 255, 0.5);
   box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.3), 0px 0px 0px 1px rgba(255, 255, 255, 0.3) inset;
 }
-.oe_snippet_manipulator.oe_selected > * {
+.oe_snippet_manipulator.oe_selected > *, .oe_snippet_manipulator.oe_active > * {
   pointer-events: auto;
 }
-.oe_snippet_manipulator.oe_selected > .oe_handle {
-  display: block;
-}
 .oe_snippet_manipulator .oe_buttons {
+  display: none;
   position: absolute;
   right: 16px;
   top: 16px;
@@ -227,6 +228,12 @@
   padding: 8px;
   cursor: pointer;
 }
+.oe_snippet_manipulator.oe_active {
+  z-index: 100000;
+}
+.oe_snippet_manipulator.oe_active .oe_handle, .oe_snippet_manipulator.oe_active .oe_buttons {
+  display: block;
+}
 
 .oe_handle {
   pointer-events: auto;
@@ -241,7 +248,6 @@
   width: 16px;
   height: 16px;
   margin: -8px;
-  cursor: move;
   -webkit-transition: background 100ms linear;
 }
 .oe_handle:hover {
@@ -266,6 +272,38 @@
   left: 0px;
 }
 
+.oe_handle.n {
+  cursor: n-resize;
+}
+
+.oe_handle.ne {
+  cursor: ne-resize;
+}
+
+.oe_handle.nw {
+  cursor: nw-resize;
+}
+
+.oe_handle.s {
+  cursor: s-resize;
+}
+
+.oe_handle.se {
+  cursor: se-resize;
+}
+
+.oe_handle.sw {
+  cursor: sw-resize;
+}
+
+.oe_handle.e {
+  cursor: e-resize;
+}
+
+.oe_handle.w {
+  cursor: w-resize;
+}
+
 /* ---- MOBILE PREVIEW ---- */
 .oe_mobile_preview.modal .modal-content {
   height: 660px;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 09d3ef51dee..e982fcc5ac0 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -117,6 +117,8 @@
         display: none
     & > *
         pointer-events: none
+    & > :not(.oe_snippet_body):not(.oe_snippet_thumbnail)
+        display: none !important
 
     & > *:first-child:not(.oe_snippet_thumbnail)
         display: block
@@ -174,22 +176,21 @@
     opacity: 0
     transition: opacity 100ms linear
     box-sizing: border-box
-    & > .oe_handle
+    pointer-events: none
+    .oe_handle
         display: none
     &.oe_hover
         opacity: 1
         cursor: pointer
-    &.oe_selected
+    &.oe_selected, &.oe_active
         opacity: 1
-        pointer-events: none
         background: transparent
         border: dashed 1px rgba(153, 0, 255, 0.5)
         box-shadow: 0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset
         & > *
             pointer-events: auto
-        & > .oe_handle
-            display: block
     .oe_buttons
+        display: none
         position: absolute
         right: 16px
         top: 16px
@@ -201,6 +202,10 @@
             display: inline-block
             padding: 8px
             cursor: pointer
+    &.oe_active
+        z-index: 100000
+        .oe_handle, .oe_buttons
+            display: block
 
 .oe_handle
     pointer-events: auto
@@ -215,7 +220,6 @@
     width: 16px
     height: 16px
     margin: -8px
-    cursor: move
     -webkit-transition: background 100ms linear
     &:hover
         background: rgb(153, 0, 255)
@@ -230,6 +234,23 @@
     bottom: 0px
 .oe_handle.nw,.oe_handle.w,.oe_handle.sw
     left: 0px
+.oe_handle.n
+    cursor: n-resize
+.oe_handle.ne
+    cursor: ne-resize
+.oe_handle.nw
+    cursor: nw-resize
+.oe_handle.s
+    cursor: s-resize
+.oe_handle.se
+    cursor: se-resize
+.oe_handle.sw
+    cursor: sw-resize
+.oe_handle.e
+    cursor: e-resize
+.oe_handle.w
+    cursor: w-resize
+
 
 /* ---- MOBILE PREVIEW ---- */
 
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 1d99722e48b..0eeab9aee99 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -88,7 +88,7 @@
     padding: 8px;
 
 }
-.oe_snippet_editor .oe_snippet.oe_selected{
+.oe_snippet_editor .oe_snippet.oe_selected, .oe_snippet_editor .oe_snippet.oe_active{
     border: 2px solid rgb(151, 137, 255);
     box-shadow: 0px 3px 17px rgba(99, 53, 150, 0.59);
 
@@ -134,7 +134,7 @@
     box-shadow: 0px 1px 3px rgb(90,90,90) inset;
     border: 0px;
 }
-.oe_snippet_editor .oe_snippet.oe_new.oe_selected{
+.oe_snippet_editor .oe_snippet.oe_new.oe_selected, .oe_snippet_editor .oe_snippet.oe_new.oe_active{
     box-shadow: 0px 2px 0px 0px rgb(151,137,255) inset, 0px 3px 17px rgba(99, 53, 150, 0.59) inset;
 }
 .oe_snippet_editor .oe_snippet.oe_new > *{
@@ -177,7 +177,7 @@
 }
 */
 
-#website-top-edit-snippet-option {
+#website-top-edit li.oe_snippet_editorbar {
     padding: 1px 8px 2px;
     font: normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
     float: left;
@@ -187,14 +187,14 @@
     background: #eeeeee;
     border-radius: 3px;
 }
-#website-top-edit-snippet-option > * {
+#website-top-edit li.oe_snippet_editorbar > * {
     display: inline-block;
     height: 22px;
     padding: 4px 6px;
     outline: 0;
     border: 0;
 }
-#website-top-edit-snippet-option a.button .icon {
+#website-top-edit li.oe_snippet_editorbar a.button .icon {
     cursor: inherit;
     background-repeat: no-repeat;
     margin-top: 1px;
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index b4c35042350..8274be4acff 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -462,7 +462,7 @@
             this.$('input.pages').val($target.text()).change();
             // No #dropdown('close'), and using #dropdown('toggle') sur
             // #closest('.dropdown') makes the dropdown not work correctly
-            $target.closest('.open').removeClass('open')
+            $target.closest('.open').removeClass('open');
         },
         /**
          * CKEDITOR.plugins.link.getSelectedLink ignores the editor's root,
diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js
index c558da530bc..9a16592eaea 100644
--- a/addons/website/static/src/js/website.snippets.js
+++ b/addons/website/static/src/js/website.snippets.js
@@ -12,8 +12,6 @@
             return this._super().then(function () {
 
                 this.$buttons.snippet = this.$('button[data-action=snippet]');
-                window.snippets = this.snippets = new website.snippet.BuildingBlock();
-                this.snippets.appendTo($(document.body));
 
             }.bind(this));
         },
@@ -23,23 +21,28 @@
             var instanceReady = false;
             this.rte.on('instanceReady', this, function () {
                 clearTimeout(instanceReady);
-                instanceReady = setTimeout(function () { self.snippetBind(); }, 0);
+                instanceReady = setTimeout(function () {
+                    self.activate_building_block_manipulators();
+                    self.activate_snippet_click_editor();
+                }, 0);
+
             });
             return res;
         },
+
+        activate_building_block_manipulators: function () {
+            window.snippets = this.snippets = new website.snippet.BuildingBlock(this);
+            this.snippets.appendTo($(document.body));
+            this.snippets.activate_snippet_manipulators();
+        },
         snippet: function (ev) {
             this.snippets.toggle();
         },
-
-        snippetBind: function () {
+        activate_snippet_click_editor: function () {
             var self = this;
             var $snipped_id = false;
             var snipped_event_flag = false;
-            $("[data-snippet-id]")
-                .filter(function() {
-                    return !!website.snippet.editorRegistry[$(this).data("snippet-id")];
-                })
-                .on('click', function (event) {
+            $("[data-snippet-id]").on('click', function (event) {
                     if (snipped_event_flag) {
                         return;
                     }
@@ -51,24 +54,23 @@
                         return;
                     }
 
-                    self.snippetblur($snipped_id);
+                    self.snippet_blur($snipped_id);
 
                     $snipped_id = $(event.currentTarget);
 
                     if (typeof $snipped_id.data("snippet-editor") === 'undefined') {
-                        $snipped_id.data("snippet-editor", new website.snippet.editorRegistry[$snipped_id.data("snippet-id")](self, $snipped_id));
+                        $snipped_id.data("snippet-editor", new (website.snippet.editorRegistry[$snipped_id.data("snippet-id")] || website.snippet.editorRegistry.box)(self, $snipped_id));
                     }
-                    self.snippetFocus($snipped_id);
+                    self.snippet_focus($snipped_id);
                 });
             $("body > :not(:has(#website-top-view))").on('click', function (ev) {
                     if (!snipped_event_flag && $snipped_id) {
-                        self.snippetblur($snipped_id);
+                        self.snippet_blur($snipped_id);
                         $snipped_id = false;
                     }
                 });
         },
-
-        snippetblur: function ($snipped_id) {
+        snippet_blur: function ($snipped_id) {
             if ($snipped_id) {
                 if ($snipped_id.data("snippet-editor")) {
                     $snipped_id.data("snippet-editor").onBlur();
@@ -78,7 +80,7 @@
                 }
             }
         },
-        snippetFocus: function ($snipped_id) {
+        snippet_focus: function ($snipped_id) {
             if ($snipped_id) {
                 if ($snipped_id.data("snippet-view")) {
                     $snipped_id.data("snippet-view").onFocusEdit();
@@ -94,9 +96,20 @@
     
     website.snippet = {};
 
+    // puts $el at the same absolute position as $target
+    website.snippet.cover_target = function cover_target($el, $target){
+        $el.css({
+            'position': 'absolute',
+            'width': $target.outerWidth(),
+            'height': $target.outerHeight(),
+        });
+        $el.css($target.offset());
+    }
+
     website.snippet.BuildingBlock = openerp.Widget.extend({
         template: 'website.snippets',
-        init: function () {
+        init: function (parent) {
+            this.parent = parent;
             this._super.apply(this, arguments);
             if(!$('#oe_manipulators').length){
                 $("<div id='oe_manipulators'></div>").appendTo('body');
@@ -107,12 +120,17 @@
 
             var snippets_template = [];
             _.each(openerp.qweb.compiled_templates, function (val, key) {
-                if (key.indexOf('website.snippets.Builder.') === 0) {
+                if (key.indexOf('website.snippets.') === 0) {
                     var $snippet = $(openerp.qweb.render(key)).addClass("oe_snippet");
-                    self.$el.append($snippet);
-                    self.make_snippet_draggable($snippet);
+                    if ($snippet.data("action")) {
+                        self.$el.append($snippet);
+                        self.make_snippet_draggable($snippet);
+                    }
                 }
             });
+
+            this.bind_selected_manipulator();
+
         },
         path_eval: function(path){
             var obj = window;
@@ -123,6 +141,21 @@
             return obj;
         },
 
+        bind_selected_manipulator: function () {
+
+            var $selected_target = null;
+            $("body").mouseover(function (event){
+                var $target = $(event.srcElement).parents("[data-snippet-id]:first");
+                if($target.length && $selected_target != $target){
+                    if($selected_target){
+                        $selected_target.data('manipulator').removeClass('oe_selected');
+                    }
+                    $selected_target = $target;
+                    $target.data('manipulator').addClass('oe_selected');
+                }
+            });
+        },
+
         // activate drag and drop for the snippets in the snippet toolbar
         make_snippet_draggable: function($snippet){
             var self = this;
@@ -305,103 +338,35 @@
             for(var i = 0, len = $targets.length; i < len; i++){
                 var $target = $targets.eq(i);
                 var $zone = $(zone_template);
-                this.cover_target($zone,$target);
+                website.snippet.cover_target($zone,$target);
                 $zone.appendTo('#oe_manipulators');
                 $zone.data('target',$target);
             }
         },
 
-        // puts $el at the same absolute position as $target
-        cover_target: function($el, $target){
-            $el.css({
-                'position': 'absolute',
-                'width': $target.outerWidth(),
-                'height': $target.outerHeight(),
-            });
-            $el.css($target.offset());
-        },
-
         // activates the manipulator boxes (with resizing handles) for all snippets
         activate_snippet_manipulators: function(){
             var self = this;
             // we generate overlay drop zones only to get an idea of where the snippet are, the drop
             // zones are replaced by manipulators
-            this.activate_overlay_zones('#wrap .container');
+            this.activate_overlay_zones('#wrap [data-snippet-id]');
 
-            var $active_manipulator = null;
-            var locked = false;
-
-            $('.oe_drop_zone').each(function(){;
+            $('.oe_drop_zone').each(function(){
 
                 var $zone = $(this);
                 var $snippet = $zone.data('target');
                 var $manipulator = $(openerp.qweb.render('website.snippet_manipulator'));
 
-                self.cover_target($manipulator, $zone);
+                website.snippet.cover_target($manipulator, $zone);
                 $manipulator.data('target',$snippet);
+                $snippet.data('manipulator',$manipulator);
                 $manipulator.appendTo('#oe_manipulators');
                 $zone.remove();
-
-                $manipulator.mouseover(function(){
-                    if(!locked && $active_manipulator != $manipulator){
-                        if($active_manipulator){
-                            $active_manipulator.removeClass('oe_selected');
-                        }
-                        $active_manipulator = $manipulator;
-                        $manipulator.addClass('oe_selected');
-                    }
+                $snippet.off("resize").on("resize", function () {
+                    self.deactivate_snippet_manipulators();
+                    self.activate_snippet_manipulators();
                 });
-                /*$manipulator.mouseleave(function(){
-                    if(!locked && $active_manipulator){
-                        $active_manipulator.removeClass('oe_selected');
-                        $active_manipulator = null;
-                    }
-                });*/
-                /*
-                $manipulator.click(function(){
-                    if($active_manipulator === $manipulator){
-                        selected = !selected;
-                        $manipulator.toggleClass('oe_selected',selected);
-                    }
-                });
-                */
 
-                $manipulator.find('.oe_handle').mousedown(function(event){
-                    locked = true;
-                    var $handle = $(this);
-                    var x = event.pageX;
-                    var y = event.pageY;
-
-                    var pt = $snippet.css('padding-top');
-                    var pb = $snippet.css('padding-bottom'); 
-                    pt = Number(pt.slice(0,pt.length - 2)) || 0; //FIXME something cleaner to remove 'px'
-                    pb = Number(pb.slice(0,pb.length - 2)) || 0;
-                    
-                    $manipulator.addClass('oe_hover');
-                    event.preventDefault();
-
-                    $('body').mousemove(function(event){
-                        var dx = event.pageX - x;
-                        var dy = event.pageY - y;
-                        event.preventDefault();
-                        if($handle.hasClass('n') || $handle.hasClass('nw') || $handle.hasClass('ne')){
-                            $snippet.css('padding-top',pt-dy+'px');
-                            self.cover_target($manipulator,$snippet);
-                        }else if($handle.hasClass('s') || $handle.hasClass('sw') || $handle.hasClass('se')){
-                            $snippet.css('padding-bottom',pb+dy+'px');
-                            self.cover_target($manipulator,$snippet);
-                        }
-                    });
-
-                    $('body').mouseup(function(){
-                        locked = false;
-                        $('body').unbind('mousemove');
-                        $('body').unbind('mouseup');
-                        self.deactivate_snippet_manipulators();
-                        self.activate_snippet_manipulators();
-                    });
-                });
-                    
             });
         },
         deactivate_snippet_manipulators: function(){
@@ -410,17 +375,17 @@
         toggle: function(){
             if(this.$el.hasClass('hide')){
                 this.$el.removeClass('hide');
-                this.activate_snippet_manipulators();
+                //this.activate_snippet_manipulators();
             }else{
                 this.$el.addClass('hide');
-                this.deactivate_snippet_manipulators();
+                //this.deactivate_snippet_manipulators();
             }
         },
     });
 
 
-    website.snippet.viewRegistry = {};
-    website.snippet.View = openerp.Class.extend({
+    website.snippet.animationRegistry = {};
+    website.snippet.Animation = openerp.Class.extend({
         $: function () {
             return this.$el.find.apply(this.$el, arguments);
         },
@@ -454,8 +419,8 @@
         $("[data-snippet-id]").each(function() {
                 var $snipped_id = $(this);
                 if (typeof $snipped_id.data("snippet-view") === 'undefined' &&
-                        website.snippet.viewRegistry[$snipped_id.data("snippet-id")]) {
-                    $snipped_id.data("snippet-view", new website.snippet.viewRegistry[$snipped_id.data("snippet-id")]($snipped_id));
+                        website.snippet.animationRegistry[$snipped_id.data("snippet-id")]) {
+                    $snipped_id.data("snippet-view", new website.snippet.animationRegistry[$snipped_id.data("snippet-id")]($snipped_id));
                 }
             });
     });
@@ -475,10 +440,12 @@
             var $el;
             if (this.template) {
                 $el = $(openerp.qweb.render(this.template, {widget: this}).trim());
+                this.$editor = $el.find(".oe_snippet_editorbar");
+                this.$thumbnail = $el.find(".oe_snippet_thumbnail");
+                this.$body = $el.find(".oe_snippet_body");
             } else {
                 $el = this._make_descriptive();
             }
-            $el = $('<li id="website-top-edit-snippet-option"></li>').append($el);
             this.replaceElement($el);
         },
 
@@ -486,14 +453,14 @@
         *  called when the user click inside the snippet dom
         */
         onFocus : function () {
-            this.$el.prependTo(this.parent.$('#website-top-edit .nav.pull-right'));
+            if(this.$editor) this.$editor.prependTo(this.parent.$('#website-top-edit .nav.pull-right'));
         },
 
         /* onFocus
         *  called when the user click outide the snippet dom
         */
         onBlur : function () {
-            this.$el.detach();
+            if(this.$editor) this.$editor.detach();
         },
 
         /* setOptions
@@ -512,23 +479,99 @@
         },
     });
 
-    
 
+    website.snippet.editorRegistry.box = website.snippet.Editor.extend({
+        onFocus : function () {
+            this._super();
+            var self = this;
+            this.$target.data('manipulator')
+                .append($(openerp.qweb.render("website.snippets.box")).find(".oe_handles").html())
+                .addClass('oe_active');
 
+            this.$target.data('manipulator').find(".oe_handle").on('mousedown', function (event){
+                    event.preventDefault();
 
-    website.snippet.editorRegistry.carousel = website.snippet.Editor.extend({
-        template : "website.snippets.EditorBar.carousel",
+                    var $handle = $(this);
+                    var $manipulator = self.$target.data('manipulator');
+                    var $snippet = self.$target;
+
+                    var x = event.pageX;
+                    var y = event.pageY;
+
+                    var padding=[parseInt($snippet.css('padding-top') || 0),
+                                parseInt($snippet.css('padding-bottom') || 0),
+                                parseInt($snippet.css('padding-left') || 0),
+                                parseInt($snippet.css('padding-right') || 0)];
+                    var margin=[parseInt($snippet.css('margin-top') || 0),
+                                parseInt($snippet.css('margin-bottom') || 0),
+                                parseInt($snippet.css('margin-left') || 0),
+                                parseInt($snippet.css('margin-right') || 0)];
+                    var size = [parseInt($snippet.height() || 0),
+                                parseInt($snippet.width() || 0)];
+
+                    $manipulator.addClass('oe_hover');
+
+                    var body_mousemove = function (event){
+                        event.preventDefault();
+                        var dx = event.pageX - x;
+                        var dy = event.pageY - y;
+
+                        if($handle.hasClass('n') || $handle.hasClass('nw') || $handle.hasClass('ne')){
+                            $snippet.css('padding-top', (padding[0]-dy)+'px');
+                            if (padding[0]-dy < 0) {
+                                $snippet.css('margin-top', (margin[0]+(padding[0]-dy))+'px');
+                            }
+                        }
+                        if($handle.hasClass('s') || $handle.hasClass('sw') || $handle.hasClass('se')){
+                            $snippet.css('padding-bottom',(padding[1]+dy)+'px');
+                            if (padding[1]+dy < 0) {
+                                $snippet.css('margin-bottom', (margin[1]+(padding[1]+dy))+'px');
+                            }
+                        }
+                        if($handle.hasClass('w') || $handle.hasClass('sw') || $handle.hasClass('nw')){
+                            $snippet.css('padding-left',(padding[2]+dx)+'px');
+                            //$snippet.css('width', (size[1]-dx)+'px');
+                        }
+                        if($handle.hasClass('e') || $handle.hasClass('se') || $handle.hasClass('ne')){
+                            $snippet.css('padding-right',(padding[3]+dx)+'px');
+                            //$snippet.css('width', (size[1]+dx)+'px');
+                        }
+                        website.snippet.cover_target($manipulator, $snippet);
+                    };
+                    $('body').mousemove(body_mousemove);
+
+                    var body_mouseup = function(){
+                        $('body').unbind('mousemove', body_mousemove);
+                        $('body').unbind('mouseup', body_mouseup);
+                        $snippet.trigger("resize");
+                        self.onBlur();
+                        self.onFocus();
+                    };
+                    $('body').mouseup(body_mouseup);
+                });
+        },
+        onBlur : function () {
+            this._super();
+            this.$target.data('manipulator')
+                .removeClass('oe_active')
+                .empty();
+            },
+    });
+
+    website.snippet.editorRegistry.carousel = website.snippet.editorRegistry.box.extend({
+        template : "website.snippets.carousel",
         start : function () {
+            var self = this;
 
-            this.$(".js_add").on('click', this.on_add);
-            this.$(".js_remove").on('click', this.on_remove);
+            this.$editor.find(".js_add").on('click', this.on_add);
+            this.$editor.find(".js_remove").on('click', this.on_remove);
 
             var bg = this.$target.find('.carousel-inner .item.active').css('background-image').replace(/url\((.*)\)/g, '\$1');
-            this.$('select[name="carousel-background"] option[value="'+bg+'"], select[name="carousel-background"] option[value="'+bg.replace(window.location.protocol+'//'+window.location.host, '')+'"]')
+            this.$editor.find('select[name="carousel-background"] option[value="'+bg+'"], select[name="carousel-background"] option[value="'+bg.replace(window.location.protocol+'//'+window.location.host, '')+'"]')
                 .prop('selected', true);
 
-            this.$('select[name="carousel-background"]').on('change', function () {
-                this.$target.find('.carousel-inner .item.active').css('background-image', 'url(' + $(this).val() + ')');
+            this.$editor.find('select[name="carousel-background"]').on('change', function () {
+                self.$target.find('.carousel-inner .item.active').css('background-image', 'url(' + $(this).val() + ')');
             });
 
             var style = false;
@@ -536,16 +579,17 @@
                 style = 'image_right';
             if (this.$target.find('.carousel-inner .item.active .container .content_image'))
                 style = 'image_left';
-            this.$('select[name="carousel-style"] option[value="'+style+'"]').prop('selected', true);
+            this.$editor.find('select[name="carousel-style"] option[value="'+style+'"]').prop('selected', true);
 
-            this.$('select[name="carousel-style"]').on('change', this.on_bg_change);
+            this.$editor.find('select[name="carousel-style"]').on('change', this.on_bg_change);
         },
         on_add: function (e) {
             e.preventDefault();
             var $inner = this.$target.find('.carousel-inner');
             var cycle = $inner.find('.item').size();
-            $inner.append(openerp.qweb.render('website.carousel'));
+            $inner.append(this.$('> .item'));
             this.$target.carousel(cycle);
+            this.$target.trigger("resize");
         },
         on_remove: function (e) {
             e.preventDefault();
@@ -555,6 +599,7 @@
                     .find('.item.active').remove().end()
                     .find('.item:first').addClass('active');
                 this.$target.carousel(0);
+                this.$target.trigger("resize");
             }
         },
         on_bg_change: function (e) {
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index a32b2dc5191..2e889c3357b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -1,23 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
 
-    <t t-name="website.snippets.EditorBar.carousel">
-        <a href="#" class="button js_add"><i class="icon icon-plus-sign"></i></a>
-        <a href="#" class="button js_remove"><i class="icon icon-minus-sign"></i></a>
-        <select name="carousel-background">
-            <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
-            <option value="/website/static/src/img/landscape.png">landscape</option>
-            <option value="/website/static/src/img/aqua.jpg">aqua</option>
-        </select>
-        <select name="carousel-style">
-            <option value="no_image">No image</option>
-            <option value="image_left">Image left</option>
-            <option value="image_right">Image right</option>
-        </select>
+    <!-- Editor -->
+
+    <t t-name="website.snippets">
+        <div class='oe_snippets hide'>
+        </div>
     </t>
 
-    <div t-name="website.snippets.Builder.carousel" data-snippet-id='carousel' data-action='insert' data-selector-siblings='#wrap .container'>
+    <t t-name="website.snippet_manipulator">
+        <div class='oe_snippet_manipulator'></div>
+    </t>
+
+    <!-- Snippets -->
+
+    <div t-name="website.snippets.box" data-snippet-id='box'>
+        
+        <!-- editor bar to display inside the top edit bar -->
+        <li class='oe_snippet_editorbar'>
+            <i class='icon-move oe_icon js_move'></i>
+            <i class='icon-remove oe_icon js_remove'></i>
+        </li>
+
+        <!-- custom data for the widget -->
+        <div class='oe_handles'>
+            <div class='oe_handle n'></div>
+            <div class='oe_handle ne'></div>
+            <div class='oe_handle e'></div>
+            <div class='oe_handle se'></div>
+            <div class='oe_handle s'></div>
+            <div class='oe_handle sw'></div>
+            <div class='oe_handle w'></div>
+            <div class='oe_handle nw'></div>
+        </div>
+    </div>
+
+    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-action='insert' data-selector-siblings='#wrap .container'>
+        
+        <!-- editor bar to display inside the top edit bar -->
+        <li class='oe_snippet_editorbar'>
+            <a href="#" class="button js_add"><i class="icon icon-plus-sign"></i></a>
+            <a href="#" class="button js_remove"><i class="icon icon-minus-sign"></i></a>
+            <select name="carousel-background">
+                <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
+                <option value="/website/static/src/img/landscape.png">landscape</option>
+                <option value="/website/static/src/img/aqua.jpg">aqua</option>
+            </select>
+            <select name="carousel-style">
+                <option value="no_image">No image</option>
+                <option value="image_left">Image left</option>
+                <option value="image_right">Image right</option>
+            </select>
+        </li>
+
+        <!-- thumbnail to display inside the bottom widget list editor -->
         <div class='oe_snippet_thumbnail oe_label'>carousel</div>
+
+        <!-- body to insert after drag and drop thumbnail -->
         <div id="myCarousel" class="oe_snippet_body carousel slide" data-interval="100000">
             <!-- Carousel items -->
             <div class="carousel-inner">
@@ -35,22 +74,33 @@
             <a class="carousel-control left" href="#myCarousel" data-slide="prev"></a>
             <a class="carousel-control right" href="#myCarousel" data-slide="next"></a>
         </div>
+
+        <!-- custom data for the widget -->
+        <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
+            <div class='container'>
+                <div class="content" style="padding-top: 90px; padding-bottom:45px;">
+                    <h1>Your New Banner Slide</h1>
+                    <h3>With another convincing subtitle</h3>
+                    <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
+                </div>
+            </div>
+        </div>
     </div>
 
-    <div t-name="website.snippets.Builder.darken" data-snippet-id='darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.darken'>
+    <div t-name="website.snippets.darken" data-snippet-id='darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.darken'>
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-    <div t-name="website.snippets.Builder.surprise" data-snippet-id='surprise' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.vomify'>
+    <div t-name="website.snippets.surprise" data-snippet-id='surprise' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.vomify'>
         <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.Builder.spacer" data-snippet-id='spacer' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.spacer" data-snippet-id='spacer' data-action='insert' data-selector-siblings='#wrap .container'>
         <div class='oe_snippet_thumbnail oe_label'>Spacer</div>
         <div class="oe_snippet_body container mt32"></div>
     </div>
 
-    <div t-name="website.snippets.Builder.title" data-snippet-id='title' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.title" data-snippet-id='title' data-action='insert' data-selector-siblings='#wrap .container'>
         <div class='oe_snippet_thumbnail oe_label'>
             Main Title
         </div>
@@ -64,7 +114,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.Builder.three-collumns" data-snippet-id='three-collumns' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.three-collumns" data-snippet-id='three-collumns' data-action='insert' data-selector-siblings='#wrap .container'>
         <section class="oe_snippet_body container">
             <div class="row">
                 <div class="col-md-12 text-center">
@@ -99,7 +149,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.Builder.header-block" data-snippet-id='header-block' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.header-block" data-snippet-id='header-block' data-action='insert' data-selector-siblings='#wrap .container'>
         <section class="container oe_snippet_body">
             <div class="row">
                 <div class="col-md-5">
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 247b0e780fd..7ddd483a6fb 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -57,38 +57,4 @@
         </div>
     </t>
 
-    <t t-name="website.carousel">
-        <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
-            <div class='container'>
-                <div class="content" style="padding-top: 90px; padding-bottom:45px;">
-                    <h1>Your New Banner Slide</h1>
-                    <h3>With another convincing subtitle</h3>
-                    <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
-                </div>
-            </div>
-        </div>
-    </t>
-
-    <t t-name="website.snippets">
-        <div class='oe_snippets hide'>
-        </div>
-    </t>
-
-    <t t-name="website.snippet_manipulator">
-        <div class='oe_snippet_manipulator'>
-            <div class='oe_buttons'>
-                <i class='icon-move oe_icon js_move'></i>
-                <i class='icon-remove oe_icon js_remove'></i>
-            </div>
-            <div class='oe_handle n'></div>
-            <div class='oe_handle ne'></div>
-            <div class='oe_handle e'></div>
-            <div class='oe_handle se'></div>
-            <div class='oe_handle s'></div>
-            <div class='oe_handle sw'></div>
-            <div class='oe_handle w'></div>
-            <div class='oe_handle nw'></div>
-        </div>
-    </t>
-
 </templates>
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index a116ee6a157..14db86e995f 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -161,7 +161,7 @@
                         <!-- Carousel items -->
                         <div class="carousel-inner">
                             <div class="item active" style="background-image: url(/website/static/src/img/greenfields.jpg); background-size: cover;">
-                                <div class="container">
+                                <div class="container" data-snippet-id="container">
                                     <div class="content" style="padding-top: 90px; padding-bottom:45px;">
                                         <h1>Create Awesome Websites</h1>
                                         <h3>Super easy, fully flexible</h3>
@@ -177,7 +177,7 @@
                 </section>
 
                 <div>
-                    <section class="container">
+                    <section class="container" data-snippet-id="container">
                         <div class="row">
                             <div class="col-md-12 text-center">
                                  <h1>Welcome To Your New Homepage,</h1>
@@ -187,7 +187,7 @@
                     </section>
 
                     <div class="dark mt64">
-                        <section class="container">
+                        <section class="container" data-snippet-id="container">
                             <div class="row">
                                 <div class="col-md-5">
                                     <img class="img-rounded img-responsive" src="/website/static/src/img/island.jpg" />