Some changes to Add EVent view
Yo merge yo