Updated calibration so it has a button on the start screen
merged conflict