Fixed contact forms issues