some refactoring and changed button style