Fix config merge bug.
Finalize the image size/placement shorthand and html structure.