That looks fantastic !! the layout of the ships is much more "natural" now and the whole thing looks awesome. For labeling you could try numbering the important buildings and then create a key. That's what I usually do for crowded maps like this. This is really great !!