Recently I have visited Het Scheepvaartmuseum (the National Marine Museum) in Amsterdam. It has been thoroughly renovated and looks beautiful. Especially the open courtyard is stunning and has become a magnificent public square. Also the museum inside has been completely redesigned. The collection is grouped according to themes.Of course you find The Golden Age, but also the presentation of the Port of Amsterdam in 24/7. The visit to the museum starts with an exciting virtual voyage at sea. It is worth a visit.
For more details: http://www.hetscheepvaartmuseum.nl/themuseum/about?t=English