Layout Fixes

Change-Id: Id25bd0327a915962dc5b12d91f93ce8642c67e32