Start on refactoring datasets view