The maybe last pass at a new layout map. Please add any changes requested as a comment below.

Leave a Reply