I suggest less question marks!

No suggestions for making dividers, although RBI sells some that fit his tubs.

As far as water dishes, I use the small animal ceramic bowls from petco.