More nav refactoring
Merge pull request #44 from chcculle/more-nav-refactoring

More nav refactoring