More appropriate cursors for controls
Adding stuff ready for calibration screens