Fixed Undo/Redo and Class movement