add core-layout back for now