Layout fix

Change-Id: I2d47f0953f664b5fdec5c5d8b0de98f79a05be25
Fix up

Change-Id: Ie5c20ab8347584c20cde126ba027f931d7fa3de0