Fix for Drag drop Clunkyness issue

Fix for the drag and drop issue where the drag element cannot be drop in the position it was picked from because multiple drop elements get moved on the drag over.