Update Javadoc and update comments in DisplayView