Improve expression layout

Change-Id: I44ac5f39864260eab08b7832524b43579c7e39ad