New layout for new measurement
Merge remote-tracking branch 'origin/master'