change button styles
change button style again
Merge branch 'master' into gh-pages