Updated Event and Calendar controllers