Fixing forms
Merge branch 'master' of github.com:AdamBSteele/frontend-parrot