Update layout

Change-Id: I017791ac86594f0f02276e29e8ac85ee86c12349