Added nav bar in content

Liked the way it was, merged with master