Help me!

I like my makeup to be somewhat organized.. So the way I have lipstick, lipglosses, balm, etc... stored is driving me nuts!! I need it to be in order and not all over the place! anyone have any ideas??

Here's what it looks like now:

there's more i just didn't feel like getting them because I'm lazy..

I was thinking about getting something like this... but without the bottom part and more rows. Does anyone have something like this or know where to get it? I want one that fits MAC lip sticks because thats what i have the most of. Maybe one that has different shaped spaces for the lipsticks would be better.