Fixed Calibration mode not going back to main screen