Calculate measurements in Measure class
Improvements to the measurement table
Preferences fix
Minor tweak to the measurement table