Refactor navigation
Merge pull request #42 from chcculle/refactor-navigation

Refactor navigation