Refactoring graph view