Added ability to navigate and also show distances in correct units