Improved drag and drop functionality