Add form fields and tracking