Image-Content Blocks and issues fixes