scrollpane fix and file cleanup