Event

Event view fixes