Fix & improve SettingsScreen