Minor fixes to the generated HTML in the form task.