Minor feature

Enhancement in node display controls
Bugfix
Minor code cleanup