Commit 42

fixed some drag and drop issues