SettingsView and some clean-up