After the first trip to the Container Store was unsuccessful I dumped most of the stuff in the second drawer and put stuff we needed most in the top drawer (not sure why I put the cigar in there).
I got some mesh wire separators at the Container Store and this how it looks now. So much better and easier, and I only removed a few things that didn't belong.
I also found some pegs at Meijer so decided to tackle our cleaning closet.
And now after
Since I was at the Container Store I also got some bins for our coat closet too, so have already started working on that, even though that's next week's project.