Updated product id calculations
Various fixes and field layout
update of sealant formula