Reworked JS and form

Messed around with the form and field cloning JS.  It works, but it
could use some refinement