move the layout spec back into its own thing