Help needed - CD storage disaster

Look at this mess, what can I do to make it better?  I'm using these at the moment, but the CD's keep falling out. 

And because they are such a pain, the CD's recently used never seem to get put back in the cupboard.

If there is somebody reading this post who has a solution to solve this problem, please let me know.  I like making things so that would be my preference.  If I could make something out of junk or recycle something, that would be a bonus.

Thanks for your help,

Anne  xx