Buttons - bad labels fixed