More view refactorings.