Refactor, cleanup, added form controls.
Merge pull request #68 from RWOverdijk/feature/form-button

Refactor, cleanup, added form controls.