NavBar tweaks
Merge branch 'master' of https://github.com/jcheng26/411.git