Give proper layout

Change-Id: Icf80d12e675c6e138f3fc15c1be9c7d37ecc52ad