Improved rendering; remove node