improved handling of items and their display