Fix up behaviour in SettingsActivity