H2 tag updates and contact page changes

Added city/state to h2 headings on pages. Adjusted display of email and
phone on contact page.