fixes to the nav bar
Merge pull request #26 from CIPowell/master

Navbar fixes