Add navigation
Merge branch 'feature/navigate' into develop