Form changes
Merge pull request #100 from ajstanley/7.x

Form changes