billing and shipping form states fix