I had recently stopped by the Berkeley Ace Hardware and they seem to have made some nice scratch-built buildings for their window layout recently. If you have not ventured into their shop yet, you should. They have a large hobby area below with tons of models and model train fun.
2145 University Ave, Berkeley, CA 94704
The layout was larger back in the 70s evidently with a series of HO trains running from downstairs up through a massive helix that ran from below to the window above, then back down. The guy in the train section had the task of taking down the helix when he first started working at the store in the 80s, I believe.
The window layout no longer connects to the trains running downstairs, but the custom buildings are a lot of fun to take in when you visit.