Introduced a second layer for layout: bare and page