Buttons enchancements
Merge pull request #77 from Boned-777/enchancements

Buttons enchancements