Fixes and enhancements to secondary nav