[#46395453] Added end date for coupons and fixed some design issues