Added missing navigation items to save in last-visited state
Refined layout for profile and changed wording