More cleanups in layout node