Fix checkout page bugs