button styling
fixes merge conflict