More code cleanup. Persons UI is pretty much right.