Improved PlotWindow and PlotControlWindow structure.