fixed button bugs
Merge pull request #7 from Awesomez/master

fixed button bugs