Builder updated for layout children + bugfix