Progressing with the view refactor