improving forms
Merge branch 'master' into frontend
improved form