Revert "Revert "Move nav into it's own view/template.""

This reverts commit f07cea239ac640ac5dc4f92124c1d3a7b14b0ab1.
Link reorder & state refactoring.