Updated SettingsActivity