Your boys are gorgeous -- love the color of their fur. We did something similar to your tray idea and also use fleece, and it's worked well for us. I like the mini-trays under the hidey houses.
Timmeh, there is one water bottle in the upper left corner and one in the lower left corner. If you look closely, the spouts are sticking through the wall. The walls are 12" high.