Cleaned up the long code for Buttons
Merge pull request #127 from dreamteam69/master

Cleaned up the long code for Buttons