UI fixes and better calibration checks