UX improvements on the calibration

We are working on making calibration better from a user perspective. Ensuring it works for all sites and that manual recalibration is smooth.