Extract navigation into its own partial.
Merge branch 'nav'