Re-add core-layout until elements that rely on it, don't

docs stuff still uses it