adjust checkout flow and fix standalone page regression