Button fixes
Merge branch 'master' of https://github.com/and3k5/Matador