[Issue #352] fixed broken toggle buttons on Graph View; other minor bug fixes
fixed merge conflict