nav refactored
Merge branch 'refactor'