added legacy fallback to layouts