So with getting into large bulk, I've decided that a drawer system with dividers will help with clutter the best. Drawers based on vendor and letter. I am going to be making the dividers, because the ones for sale are gonna be crazy expensive for 400 flavors. I was trying to find one that is at least 3 inches deep, 4in should be good for a lot of 120ml bottles lots of companies have.

https://www.amazon.com/gp/aw/d/B00RZ9DPOW/ref=psdcmw_490631011_t1_B01J15NHJK