fixed conflicts, improved form
Merge pull request #72 from voisardf/formupdate

fixed conflicts, improved form