Make editable node separate from container nodes

Make editable node separate from container nodes