Move event creation to only occur on button click.