Added the main nav
bringing in sync with develop
Merge pull request #11 from twg/feature/navs

Feature/navs