Improved SettingsWindow