Improved Drag and Drop of widgets