SettingsView bug fixes