Ajustes layout
Merge