UPDATED: Cleaned up CMS fields for Calendar