Updated camera and control components