More improvements to navigation