Wrap .container or .container-fluid around each content element

Default should be .container. Best way could be to use the layout selector in the content element.