Fix build error
Undo/Redo fixes

Fixed bugs with undo/redo implementation.
Shortened event timer