More cohesive navigation and parse fixes