Ha ha, I feel your pain!
I found a 3-drawer desktop organizer with an addition space with a lid on top at the local cheap stuff store. That *mostly* kept it under control for me. Batts, PCC's, and cartos on top, top drawer was juice, middle was DIY tools, bottom was PG/VG, nic, and flavors...