forms fixed
Merge branch 'bugs/form-fix'