More fixes for events
Fixed calendar controller
Clean up