changed layout order