Drag and Drop - saving and default bug fixed