Additional improvements on product form
Product form improvements