remaining dialogs refactored