Views need refactoring