restructure layouts