Fixing and Restructuring Undo Redo