improved form
form input fields
Merge branch 'formfix'