Fixing form types
Merge pull request #19 from tganyan/form_fixes

Fixing form types