Various secondary nav fixes.

Nope... good catch :+1: