Fixing BPS-505. And re-formatting code of PeopleActivity.