GS-11422
syntax fixed
GS-11422
nodes shrink to fit
Merge branch 'layoutFixes'