Buttons now point to the correct places.