Improved our ExtendedCalendarView