layout restructuration