Changed a few buttons.
Merge pull request #16 from ghuitster/master

Few changes