Markup fixes based on Validator results