tidy up
Greatly simplified code to bind UI to model with unit conversion