Form fixes
Merge pull request #61 from JonNatanael/master

Form fixes