altar organization

How do you keep oils and tinctures organized?

I’m trying to tidy up my altar and my oils and tinctures are scattered around. I have drawers, but I’m worried bottles might leak. What storage setup works…