Issue #257: Clean up People menu items.

Running tests after latest pull/merge
Lots of conflicts in this file need to be updated.