Added simple calendar for events
Add more event features