fixing forms to match models