Rework presentation of measures