Make contact forms more consistent

Mainly did this: put name and email fields first, and added dept name to the thank-you pages.