Merge pull request #392 from leider/master

Buttons now cleaner