Nice setup, I need to put wheels on mine soon.
The water bottles are not that bad, been using them for several years now.