Minor changes to calendarController