Fix several layout issues

Bug:3135594
Bug:3158860

Change-Id: I2d592afb2cfc8aaf2f00aca38c9d123719bcb8bc
13 files changed