Merge views of user and person, refactor the nav-bar