Drag and drop works :D

Submission bug is also fixed