Design changes in CheckoutWizard