Add ScrollableJPanel, refactoring