Gift Message Function

Hi!
Is there a way to have a customer review their gift message before placing their order? The gift message option is available in the first screen of the shopping cart before clicking "checkout". We've recently had many customers miss the gift option input field and instead type the message on the second screen into the "shipping comments" box thinking this was the "gift message" box. So the invoice generates with price paid etc and then the gifting customer is very unhappy when the person they sent the gift to receives the invoice with price etc....how can we make this more user friendly?