More dialog slot refactoring