Cleaned up CalendarDay and CalendarDayView