Made buttons change on click.
Merge branch 'master' into sarah