Annotate button press instead of using listeners

Let annotations handle the button clicks. This removes the need for listeners. Its minor but will clean it up a little bit.