formatting fixes to shipping and billing

defect: 2300