Edited JList display
Edited to interface with JList
Merge origin/master