Buttons now display correct messages