988ea8f70a
* Make event non-async * Only add event listener if the button exists * Add support for menu for removal