Nelson and James' fix for the extra textfields/submit button on the form.

....