Drag and drop improvement