Updated drag and drop functionality