Further refactoring. Squish bug in global nav.