Fix corect labeling of keypad buttons on draw