Refactor, break-out cameras and aspect ratio