fix wizard back/next issues with acc calibration
tidy up