Graph vizualisation refactored