Bug fixes for list and image