Corrected drag & drop functionality