Added Tonne and Millimeters, rearranged length dropdowns