Fixed HTML 5 issues