Improve product form