Scroll pane fixes