Checkout load fix, create account, code cleanup