Contact Form and Location module update

Contact Form and Location module update