move stuff around to use the common/contact form