Bugfixes + css class on drag