I put my charms in plastic sq containers. Found some in a garage sale for $.10 so i bought them all- they fit perfectly and the lid snaps shut.. I only have one jelly roll and its plopped on my shelf.. Just sitting there looking pretty (collecting dust really).. the rest I have in sterilite containers by size (1.5xWOF, 2xWOF, 2.5xWOF,3xWOF,3.5WOF).. I ruler fold anything under a yard and a half.. anything 2 yards or longer I just roll back on the bots that they came on from the LQS..
Looks like you are off to a great start.. Your room looks awesome... And a wonderful hubby for takin care of your quilting needs !!! Bookcases look awesome..