Refactor navigation
Merge pull request #2184 from guardian/refactor-navigation

Refactor navigation