Fixup routing slightly and more prep for payment page