Bump to 30 buttons, include match description label