Various secondary nav fixes.
Merge pull request #740 from lonelyplanet/remy-secondary_nav_legacy

Various secondary nav fixes.