Event2 design tweaks