diff --git a/src/jquery.draggable.js b/src/jquery.draggable.js
index 531de70f8..d61ed2bcc 100644
--- a/src/jquery.draggable.js
+++ b/src/jquery.draggable.js
@@ -9,7 +9,7 @@
 ;(function($, window, document, undefined){
 
     var defaults = {
-        items: '.gs_w',
+        items: 'li',
         distance: 1,
         limit: true,
         offset_left: 0,
diff --git a/src/jquery.gridster.css b/src/jquery.gridster.css
index e07b7e01c..c38a9c5a8 100644
--- a/src/jquery.gridster.css
+++ b/src/jquery.gridster.css
@@ -11,19 +11,20 @@
     transition: height .4s;
 }
 
-.gridster .gs_w{
+.gridster .gs-w {
     z-index: 2;
     position: absolute;
 }
 
-.ready .gs_w:not(.preview-holder) {
+.ready .gs-w:not(.preview-holder) {
     -webkit-transition: opacity .3s, left .3s, top .3s;
     -moz-transition: opacity .3s, left .3s, top .3s;
     -o-transition: opacity .3s, left .3s, top .3s;
     transition: opacity .3s, left .3s, top .3s;
 }
 
-.ready .gs_w:not(.preview-holder) {
+.ready .gs-w:not(.preview-holder),
+.ready .resize-preview-holder {
     -webkit-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
     -moz-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
     -o-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
diff --git a/src/jquery.gridster.js b/src/jquery.gridster.js
index f16d7f6e5..d1d5b35a0 100644
--- a/src/jquery.gridster.js
+++ b/src/jquery.gridster.js
@@ -30,6 +30,7 @@
         },
         collision: {},
         draggable: {
+            items: '.gs-w',
             distance: 4
         }
     };
@@ -86,7 +87,7 @@
         this.options = $.extend(true, defaults, options);
         this.$el = $(el);
         this.$wrapper = this.$el.parent();
-        this.$widgets = this.$el.children(this.options.widget_selector).addClass('gs_w');
+        this.$widgets = this.$el.children(this.options.widget_selector).addClass('gs-w');
         this.widgets = [];
         this.$changed = $([]);
         this.wrapper_width = this.$wrapper.width();
@@ -174,7 +175,7 @@
                 'data-row': pos.row,
                 'data-sizex' : size_x,
                 'data-sizey' : size_y
-            }).addClass('gs_w').appendTo(this.$el).hide();
+            }).addClass('gs-w').appendTo(this.$el).hide();
 
         this.$widgets = this.$widgets.add($w);