Checkout form update
Checkout fixes