Implemented output for undo
Merge remote-tracking branch 'origin/ui/victor' into logic/wenhao