New container syntax
New header syntax
Improve images markup