Started refactoring views