Improved navigation.
Another improvement to navigation.