A possible way to fix the issues with the buttons
Merge pull request #23 from JeromeLefebvre/master

A possible way to fix the issues with the buttons