unified layout

Change-Id: Ibb9a4f6bb32e89fabedba4859baddad1dc37935f