[EH] layout improvements