change layouts a little

Change-Id: I44313f1f710e4ec2db933de7802ac504333348df