Drag-and-drop bugs modification

Copy-Paste bugs excahnge