Changed from fancy to strightforward layout.

Change-Id: I43b3eb98962b6cd9a70b8f70e8e12fe40da9fdd7