Integrated new scrollpane code