added nav bar
merged with master