Switched addevent type selector to popup, fixed bugs