updated events ui
Merge branch 'master' into kingman