Plastic Container Craziness

There is a moment in every day when I have to face it-- the cupboard that contains all my plastic containers (Rubbermaid, Tupperware, etc.) I straighten it and get it all back in shape on about a weekly basis and am always surprised (although not sure why at this point) that it is an absolute disaster. I think I should invent a system to solve this problem (toddler lock and husband on board with my solutions might help). My most recent solution was to always put the lid ON the container when returning it to the cupboard so I would at least not have to look for it. That didn't last long and things are chaos again.