ui tweaks and person view
fixing merge