[D641] Updated Payment page and supporting code to spec