de-nest nav structure around custom code to make it require less digging

this doesnt actually change the routes the pages resolve on or the page paths they load,
it only affects nav structuring

Author: bosh