Update cf-layout & use new content-l classes