Type images

Added proper type image handling in the main list