changed layout structure