Add routing to navigation
Merge branch 'routing'