Dialog refactoring
Undo Bar