Navigation improved.
Merge branch 'feature/navigation-improvements' into staging