Added form submit handler, cleaning up form field names etc