layouts architecture update