More refactoring of dialog fragments