[EH] small layout improvements