undo with correct display and stack handle OK