Improved list and image handling