Rename UndoItem to UndoToken
Fix layout