Worked some on the Calendar UI