make payments and review pages more versatile/tolerant