btn fixes
Merge branch 'button-styles'