Updates to map to get the colors and popup tabs right