Think this layout is best :)

Change-Id: I4bee4538faf168d17e31e60353955c0589c4ae3a