fix/drag-and-drop-fixes