Refactoring views, still..