Refactored dialogs