Improve HTML markup to pass the validation test