Node layout refactoring

Change-Id: I7285f194d5feb9f73644deecc339d9d381baad99
Merge "Node layout refactoring"