better org for button event handlers