Button improvement

Allows for better customization of the button trigger.