All of this stuff should be in the layout page. Might be worth creating a legacy layout for the old stuff and a new one with this included in there.