Codes entry fix
codes entry update
Device calibration fix
Report screen tidy up