added calendar
fixed display of events