Updated for Calendar, however the architecture for calendar should probably change.  Also, changed some styles...