fix form template (in progress)