Move setting shift logic to CameraManager
Update layout