Giftcard style fixes based on latest global version
More QA from Kevin