Update layout feature to put page contents into sublayout