Add form fields, refactor jquery a little