changed order of fields on form so they made more sense