Add Image Height and Width information

Also add <p></p> around TextContent.