Improve button class
Merge pull request #1 from mstone6769/master

Improve button class