updated and patched drag & drop fjunctionality