Agregados los botones necesarios
Merge branch 'design_erika' into design_luz