Recently I took Jake on a trip with me and found that the food and water dish that comes with the carrier is not good. The food maybe, but the water gets all over. Can cats drink out of the bottles that rabbits and other rodents use? And is there a way to put it in the carrier. Or any other way to minimize the mess?