I would probably just reorganize the tubs by color or type of fabric, and take advantage of the ones that are translucent by folding the fabrics so you can see some part of each one from the outside.
Also, as a fellow salt and pepper shaker collector, I wanted to show you this cutie.
I love S&P Shakers
[ATTACH=CONFIG]119132[/ATTACH]