Improve the drag and drop