Buttons now actually point to proper places.