Merge pull request #414 from timschofield/develop

Improvements to display
Hos the units used to measure the labels
Some minor code layout changes
Remove inneficiencies in the code
Merge pull request #415 from fahadhatib/develop

Develop