Update event UI
Merge branch 'improve_ui'