Minor changes.
Minor improvements to unit navigator.