More S2 layout changes