fix forms
refactor form