layout restructure