Improvements to MainActivity and new CameraCalibration structure