Fixed some issues
Agrege lo que faltaba
Updated
Update icons and layout, add backbutton