Add coupon form widget + some fix