Product & Header fix