Commit 21

Fixed drag & drop