Addition of vouchers to the products section; minor refactoring