Add expected duration field
Add html change on event type logic