Dialog refactoring complete.