Improve HTML semantics