Improved nav bar; still needs work
Merge branch 'nav-bar'