Switch remaining modals over to use proper el and eventing usage.