modify style and fix erros