Improve drag and drop (I think)