Working through layout changes / Updated THCameraButton