checkout step 2 improvements