Improved unit display.
Extracted the distance into a control (doesn't support units right now)