Fix layout and markup for measurements input.