Cleanup and improvements to calibration edit+display pages.