cambiato layout
fixed some stuff