directed graph, refactoring graph creation
Layout changes