restruct layouts