Assets loading states
Refactor Models
Views stuff