Layout fixes
Nicer Plot
MeasurementType added