Merge "Refactor Dialogs"