Simplify HTML and move editable image inside content-core.