changed button styling
Merge branch 'chris'