Refinement of the drag and drop functionality