Cosmetic changes. Added JScrollPane(s)