do minor style refactoring and make buttons more uniform