Foam Board Organizer

So since I made the Nail polish foam board shelf, 4 of the shelves have needed to be re-glued. It is kinda irritating to walk into my room to pick out a polish of the day to find that my shelf is screwed. Trust me, it is no easy task to hot glue the shelves once it already put together. Thank god I have a small glue gun or it would never have fit in there to even glue it back together. Anyone else have trouble with these things or is it just me? I would love to know how you organize your polishes. What are your ideas?