remove button style, some refactor