Wrap billing and shipping fields with a div/class Closes #4758