Made the mixed dialogs modular