Changes to Calendar for event data

Added new view and changed model and controller
Fix for calendar query conflict

moved vendor query call to footer