Enhance HTML, less errors on home page