Fix graph display and linking