CircleLayout and Calendars migrated to unified