Updates to both the edit and add event type interface, and updates to the supporting models. Refs #393