SettingsDialog refactoring