Save state y restore de views funcionando
Merging with dexa's code