edit events is also pretty now
Merge remote-tracking branch 'origin/master'
hereeeee