Improve header structure
Update 404 header structure