Some attempts to help Mr. Jenkins to be happier
More FormButton usage, no refactor though
Merge pull request #1095 from mfalesni/green-green

Some attempts to help Mr. Jenkins to be happier