Minor improvements to navigation