More work on SettingsWindow