More .dialog refactoring