Fixing issues with moving clusters and undo/redo.