clean layout

Change-Id: If58d50b2e95745dbbd272539014f5df693a1b515