Fixes for images and markup