Add names and values to the buttons, for good measure.