Bugfixes drag and drop