Tweak layouts

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>