Further improved image listing.