[EH] changed layout