XML looking better. Names saved multiple times needed to be taken care of.