further fixes for spacing with images and word wrap