Further refine payment pages (unfinished)