Issue #29: Integrated visual graph in main UI. Fixed issue with wrong
AJB