Image fixes and content fixes