refactored CalendarActivity