More basket and check out changes