New separate layout model coming along.