Notable Space Museums

Are their any other space museums/tours in SoCal other than The Griffith Observatory? I was a little disappointed with the Observatory and how little they had. I can't remember if JPL had one. Any ideas?

Here's a whole slug of them -
http://www.nasa.gov/centers/dryden/about…

The San Diego Air and Space Museum is nice