nav added
more nav
Merge branch 'addnavbar'