Modified RepackPanel.java & UnpackPanel.java