Layouts update

Signed-off-by: Jean Bordat <bordat.jean@gmail.com>