More dialog fragment refactoring