Fix the image under the root, add enclosure in general