[BUGFIX] Fix buttons
Merge pull request #535 from hmspl/buttons

[BUGFIX] Fix buttons