adding some modifications on SettingActivity