Various secondary nav fixes.