made edit button for events
added delete button to events
merge conflicts