new complete layout support