Fixed bugs/HTML Validation