View first
models later
Needed refactoring on views too