Updated Calibration layout for Calibration_