Se optimiza los layouts a templates

Signed-off-by: gnu <gnu@localhost>