layout updates

Change-Id: I550a659642c2e3f75ca8eacefdd3590f9fef80c8