layout rework

Change-Id: I453a0fb6236689fa990540b46522855a625c0d1b