Rollback unnecesary change
Added SettingsActivity