Form maker fixes
Merge pull request #1 from jefree/fixes

Form maker fixes