Re-added the card payment template and cleaned up the XML.