Improved display of nodes and variables

Fixes #11