FIXED: Added xml forms for address and payment