I have a modified approach. When my layout was under construction, I used the Glenn Snyder shelving units to store the rolling stock (see 1st photo). They were excellent. But I am an operator not a collector, so I designed the layout with lots of sidings to "store" my various consists. Granted, this took up a lot of real estate in my limited space, but I have 11 different consists available to run at any time on 3 main lines. The shelves came down (were eventually sold) so that I could mount backdrops for the layout (see 2nd & 3rd photos). I do have about a half dozen rolling stock items stored in 2 shallow bins under the table. The rolling stock on one of the sidings changes with the season or mood of my grandkids: Christmas items, Thomas the tank, Wilson Chuggington Loco, etc.
Michael