Added messages for all event types
Improvements to event layout
Fixed switch fallthrough causing wrong messages