changed layout flow