[0000584] Layout checkout step 2