Better Caption / Image Labeling

Is there a plugin out there that allows you to add captions to images? The default wp captions always screw up the image alignment.

I was going to title every image in photoshop but there will be hundreds to add so this will be a lot of work.