Improved transition to camera