Configure new click event flow

Reconfigure first click and second click.