rearanged the nav bar and added links to friends
fixed merge