Integrate site layout in builder
Fix builder integration