Navigation works.
Merge branch 'nav-refactoring'
Removed unused code.