#547696: Update node.tpl to use ideas from D7