Fixed a issue of event getting disaplyed onto the list view and refactored to code to create event objects