Merge pretty payment pages in (bug 938675)