SettingsWindow fixes and improvements