Fixed JDK Collections backwards incompatability and implemented display logic