Some additional changes to the node editing