Added some windows for calibration CRUD