Various secondary nav fixes.

Does that not end up just being white?