JPL is keen to separate the Shipping Options and Gift Message from the 'How would you like your order' section in the checkout (they have older clients so they want to make these options stand out more): https://blackpepper.clickup.com/t/86cz335hv