Fix up expanded layout

Change-Id: Iab1e6509ddc2085705339965618a398b9a26fa15