Fixing some markup erros