Updated to use new contact form blocks