Improve header markup