Secondary nav refactorings