wraps label and input in their own divs

to force block styling (short labels were putting them both inline which
looked odd)
re-arranged sort order to be consistent with refs

respects the canonical order of measurements as arranged in
site.data.measurements