Split off nav partial and other minor fixes.