Minor clean-up.
Extracted the speed display into a control and fixed issues with the speed.