Added state and zip to customer address
Updated to current default template