Some further updates to NetworkViewer tool.