Changed buttons, too