GIS-Graph View updated + refactoring