Promotions: Fix the category and product quantity conditions so they provide the correct qualifications
Checkout: Tweak the layout of the code promo field