Refactor button support.
Merge pull request #499 from tobeytailor/buttons

Refactor button support.