button styling
Merge branch 'badams'