Improve network graph
Merge pull request #2709 from hiroponz/improve-network-graph-2

Improve network graph