Matches matrix
Fix buttons
Merge pull request #216 from willwclo/is-it-dinner-time-yet

Tweak UX to match colour scheme and fix merge conflict