Various secondary nav fixes.

Is this meant to have a trailing comma?