Added a highlighted state to the buttons.
Merge remote-tracking branch 'henry/master'