Looks good Bryan. Im working on a 20 tub mouse rack right now. I hate stapling the hardware cloth to the shelf frames, so I do one then dink off for 10-15 minutes.
If you get tired of dinking with the water bottles every time you need to open a tub, move the bottles to the side instead of the front. I usually put them towards the front so I can slide the tub out almost all the way.

Bryan