I want to fix a couple of issues with my XJ steering. It is a little loose, occasionally vibrates, and sometimes clunks when going over rough ground. The steering box just started leaking and I've read about the benefit to completely replace it. What is a good kit for the rest of the steering parts?

The Jeep is stock. I'm aiming at cheapest parts that are reliable for a daily driver and light off-road.