changed expand into layout