Highlighted state for buttons
Merge remote-tracking branch 'origin/exampledesign'