Revert "Revert "nav restructure""
Merge pull request #5054 from guardian/revert-5035-revert-5027-nav-restructure

Enable nav restructure