fix core_layout definition