Various changes to facilitate addition of a new ProductPanel