cloth diapers

At night if she has a wet diaper shortly before her bathtime, I've been putting on a cloth diaper with pins which is quite bulky as I believe was shown in a previous post. I've been researching some contour cloth diapers that might fit better as I can't seem to get the right fit with the standard rectangular cloth diaper that I've had [since B's birth and had just used them for burp cloths for him and then for her].I've decided to try & use more cloth diapers at night so I'll have to shop around and get some other type of fastners/pins than what I have now.