Improved drag and drop.