Some changes to Graph rendering