Fix graph layout with labels