halfway done refactoring views