Buttons update correctly