Better image handling

Add support for images that are not links.