Layout

Replace self-closing tags.
Update metadata and remove type attr.