Adjust Layout

Change-Id: Ic6506b699cc514882c03a926f73328a65d548ad6