graph view improvements
Merge origin/master