restruct layout