updated edit for events
updated UI