Updates on ProductControl and ProductViewControl.